From ec39cb553cc4d72c877f3a4d8645d71a4d7d5d89 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sat, 20 Jul 2019 14:19:36 +0800
Subject: [PATCH] 1

---
 server/gameserver/framemaker.cc |  8 ++++----
 server/gameserver/human.cc      | 36 ++++++++++++++++-----------------
 server/gameserver/human.h       |  8 ++++----
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 2acda85..b51c49c 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -11,16 +11,16 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
     cs::SMUpdate* msg = new cs::SMUpdate;
     {
         Room* room = hum->room;
-        for (auto& itr : hum->new_objects) {
+        for (auto& itr : hum->new_objects_) {
             itr->FillMFObjectFull(msg->add_full_objects());
         }
-        for (auto& itr : hum->part_objects) {
+        for (auto& itr : hum->part_objects_) {
             itr->FillMFObjectPart(msg->add_part_objects());
         }
-        for (auto& itr : hum->del_objects) {
+        for (auto& itr : hum->del_objects_) {
             msg->add_del_objids(itr);
         }
-        for (auto& itr : hum->out_objects) {
+        for (auto& itr : hum->out_objects_) {
             msg->add_out_objids(itr);
         }
         for (size_t idx : hum->shots_) {
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index fda7fe3..e15a00c 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -393,7 +393,7 @@ void Human::SyncAroundPlayers()
 {
     for (auto& cell : grid_list) {
         for (Human* hum : cell->human_list) {
-            hum->new_objects.insert(this);
+            hum->new_objects_.insert(this);
         }
     }
 }
@@ -501,32 +501,32 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
 
 void Human::AddToNewObjects(Entity* entity)
 {
-    new_objects.insert(entity);
+    new_objects_.insert(entity);
 }
 
 void Human::AddToPartObjects(Entity* entity)
 {
-    part_objects.insert(entity);
+    part_objects_.insert(entity);
 }
 
 void Human::RemovePartObjects(Entity* entity)
 {
-    part_objects.erase(entity);
+    part_objects_.erase(entity);
 }
 
 void Human::RemoveObjects(Entity* entity)
 {
-    del_objects.insert(entity->entity_uniid);
+    del_objects_.insert(entity->entity_uniid);
 }
 
 void Human::AddOutObjects(Entity* entity)
 {
-    out_objects.insert(entity->entity_uniid);
+    out_objects_.insert(entity->entity_uniid);
 }
 
 void Human::RemoveOutObjects(Entity* entity)
 {
-    out_objects.erase(entity->entity_uniid);
+    out_objects_.erase(entity->entity_uniid);
 }
 
 bool Human::HasLiveTeammate()
@@ -872,7 +872,7 @@ void Human::SendUpdateMsg()
                         }
                     }
                     for (Entity* entity : view_objects) {
-                        if (new_objects.find(entity) == new_objects.end()) {
+                        if (new_objects_.find(entity) == new_objects_.end()) {
                             entity->FillMFObjectFull(msg->add_full_objects());
                         }
                     }
@@ -1549,26 +1549,26 @@ void Human::PullHuman(const a8::Vec2& pull_dir, float distance)
 
 void Human::ClearFrameData()
 {
-    if (!new_objects.empty()) {
-        new_objects.clear();
+    if (!new_objects_.empty()) {
+        new_objects_.clear();
     }
-    if (!del_objects.empty()) {
-        for (auto& itr : del_objects) {
+    if (!del_objects_.empty()) {
+        for (auto& itr : del_objects_) {
             Entity* entity = room->GetEntityByUniId(itr);
             if (entity) {
-                part_objects.erase(entity);
+                part_objects_.erase(entity);
             }
         }
-        del_objects.clear();
+        del_objects_.clear();
     }
-    if (!out_objects.empty()) {
-        for (auto& itr : out_objects) {
+    if (!out_objects_.empty()) {
+        for (auto& itr : out_objects_) {
             Entity* entity = room->GetEntityByUniId(itr);
             if (entity) {
-                part_objects.erase(entity);
+                part_objects_.erase(entity);
             }
         }
-        out_objects.clear();
+        out_objects_.clear();
     }
     if (!shots_.empty()) {
         shots_.clear();
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 3217b63..59cb217 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -217,10 +217,10 @@ protected:
 
     std::array<int, IS_END - 1> inventory_ = {};
     std::array<int, IS_END> volume_ = {};
-    std::set<Entity*> new_objects;
-    std::set<Entity*> part_objects;
-    std::set<int> del_objects;
-    std::set<int> out_objects;
+    std::set<Entity*> new_objects_;
+    std::set<Entity*> part_objects_;
+    std::set<int> del_objects_;
+    std::set<int> out_objects_;
     std::vector<int> shots_;
     std::vector<int> emotes_;
     std::vector<int> bullets_;