1

server/gameserver/player.cc

@@ -158,12 +158,9 @@ void Player::InternalUpdate(int delta_time)
         if (drop_weapon) {
             UpdateDropWeapon();
         }
-        // 222
-        #if 0
-        if (interaction_objids.size() > 0) {
+        if (!interaction_objids.empty()) {
             ProcInteraction();
         }
-        #endif
         if (poisoning) {
             UpdatePoisoning();
         }
@@ -604,8 +601,6 @@ void Player::ProcInteraction()
         return;
     }
     cs::SMGetItemNotify notify_msg;
-    // 222
-    #if 0
     for (auto obj_id : interaction_objids) {
         Entity* entity = room->GetEntityByUniId(obj_id);
 #ifdef DEBUG
@@ -667,11 +662,10 @@ void Player::ProcInteraction()
 #endif
         }
     }
-    interaction_objids.Clear();
+    interaction_objids.clear();
     if (notify_msg.items().size() > 0) {
         SendNotifyMsg(notify_msg);
     }
-    #endif
 }
 
 void Player::ObstacleInteraction(Obstacle* entity)
@@ -882,12 +876,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
     if (!shot_hold) {
         series_shot_frames = 0;
     }
-    // 222
-    #if 0
     if (msg.has_interaction()) {
-        interaction_objids = msg.interaction_objids();
+        for (auto objid : msg.interaction_objids()) {
+            interaction_objids.push_back(objid);
+        }
     }
-    #endif
     last_seq_id = msg.seq();
     if (msg.has_select_weapon()) {
         select_weapon = true;

server/gameserver/player.h

@@ -86,10 +86,7 @@ class Player : public Human
 
     std::shared_ptr<cs::MFSettlement> settlement;
 
-    // 222
-    #if 0
-    ::google::protobuf::RepeatedField< ::google::protobuf::int32 > interaction_objids;
-    #endif
+    std::vector<int> interaction_objids;
 
     virtual ~Player() override;
     virtual void Initialize() override;