From d442c60cf4b7fd6c9a01ea31da24fcbbdee76d40 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Apr 2019 17:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98ok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/human.cc | 4 ++++ server/gameserver/player.cc | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index aeb778e..4739b4b 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -26,6 +26,10 @@ Human::Human() } weapons[0] = default_weapon; curr_weapon = &weapons[0]; + inventory.reserve(MAX_INVENTORY_NUM); + for (size_t i = 0; i < MAX_INVENTORY_NUM; ++i) { + inventory.push_back(0); + } } Human::~Human() diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 055756c..7918cac 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -57,10 +57,6 @@ void Player::Initialize() helmet_meta = MetaMgr::Instance()->GetEquip(helmet); chest_meta = MetaMgr::Instance()->GetEquip(chest); RecalcSelfCollider(); - inventory.reserve(MAX_INVENTORY_NUM); - for (size_t i = 0; i < inventory.size(); ++i) { - inventory[i] = 0; - } } void Player::Update(int delta_time) @@ -532,7 +528,7 @@ void Player::MakeUpdateMsg() if (updated_times == 0 || need_sync_active_player) { update_msg->set_active_player_id(entity_uniid); FillMFActivePlayerData(update_msg->mutable_active_player_data()); - need_sync_active_player = true; + need_sync_active_player = false; } if (updated_times == 0 || last_sync_gas_frameno < room->gas_data.gas_start_frameno) { last_sync_gas_frameno = room->gas_data.gas_start_frameno;