diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 8d3273d..fda7fe3 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -832,8 +832,8 @@ void Human::SendUpdateMsg() } cs::SMUpdate* msg = room->frame_maker.MakeUpdateMsg(this); - if (send_msg_times == 0 || last_sync_gas_frameno < room->gas_data.gas_start_frameno) { - last_sync_gas_frameno = room->gas_data.gas_start_frameno; + if (send_msg_times == 0 || last_sync_gas_frameno_ < room->gas_data.gas_start_frameno) { + last_sync_gas_frameno_ = room->gas_data.gas_start_frameno; FillMFGasData(msg->mutable_gas_data()); } bool refreshed_view = false; @@ -847,7 +847,7 @@ void Human::SendUpdateMsg() } } } - if (observer != this && !observer->follow_synced_active_player) { + if (observer != this && !observer->follow_synced_active_player_) { msg->set_active_player_id(entity_uniid); FillMFActivePlayerData(msg->mutable_active_player_data()); if (!refreshed_view) { @@ -878,7 +878,7 @@ void Human::SendUpdateMsg() } refreshed_view = true; } - observer->follow_synced_active_player = true; + observer->follow_synced_active_player_ = true; } else { if (active_player_data_pb) { msg->set_active_player_id(entity_uniid); @@ -910,7 +910,7 @@ void Human::FollowTarget(Human* target) } target->AddObserver(this); follow_target_ = target; - follow_synced_active_player = false; + follow_synced_active_player_ = false; } void Human::SendDebugMsg(const std::string& debug_msg) diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 04b8d38..3217b63 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -232,7 +232,7 @@ protected: std::set property_chged_humans_; std::set observers_; Human* follow_target_ = nullptr; - bool follow_synced_active_player = false; + bool follow_synced_active_player_ = false; MetaData::Player* meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr; @@ -241,7 +241,7 @@ protected: private: CircleCollider* self_collider_ = nullptr; - long long last_sync_gas_frameno = 0; + long long last_sync_gas_frameno_ = 0; std::list buff_list_; std::array buff_effect_ = {};