diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc index 02c96a2..8fc4ea4 100644 --- a/server/gameserver/framemaker.cc +++ b/server/gameserver/framemaker.cc @@ -347,7 +347,7 @@ void FrameMaker::SerializeSmokes(cs::SMUpdate* msg, Room* room, Human* hum, Fram void FrameMaker::SerializePlaySkills(cs::SMUpdate* msg, Room* room, Human* hum, FrameData* framedata) { for (size_t idx : framedata->play_skills_) { - msg->mutable_play_skill_list(framedata->play_skills_.size()); + msg->mutable_play_skill_list()->Reserve(framedata->play_skills_.size()); if (idx < room->frame_event.play_skills_.size()) { auto& tuple = room->frame_event.play_skills_[idx]; if (std::get<0>(tuple).Get() && hum->CanSee(std::get<0>(tuple).Get())) { diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 12bf82d..25a0e05 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -802,7 +802,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg) use_skill = false; } last_cmmove_frameno = room->GetFrameNo(); -#ifdef DEBUG +#ifdef DEBUG1 if (msg.has_drop_weapon()) { SendDebugMsg(a8::Format("zzzzzzzz frameno:%d drop_weapon:%d", {room->GetFrameNo(), msg.drop_weapon()})); }