From e15d50950a85bf312a754e9abbaee4e47a1691b5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 26 Jun 2019 16:30:50 +0800 Subject: [PATCH] 1 --- server/gameserver/human.h | 2 +- server/gameserver/player.cc | 4 +--- server/gameserver/room.cc | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/gameserver/human.h b/server/gameserver/human.h index e010b36..a3aa4ff 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -142,7 +142,6 @@ class Human : public Entity int target_id); void CancelAction(); void ResetAction(); - void FillSMGameOver(cs::SMGameOver& msg); void BeKill(int killer_id, const std::string& killer_name, int weapon_id); void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id); void AddToNewObjects(Entity* entity); @@ -205,6 +204,7 @@ private: void GenBattleReportData(a8::MutableXObject* params); void InternalSendGameOver(); void DeadDrop(); + void FillSMGameOver(cs::SMGameOver& msg); protected: long long last_shot_frameno_ = 0; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 1bae217..5d0470a 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1030,9 +1030,7 @@ void Player::_CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg) void Player::_CMGameOver(f8::MsgHdr& hdr, const cs::CMGameOver& msg) { - cs::SMGameOver respmsg; - FillSMGameOver(respmsg); - SendNotifyMsg(respmsg); + SendGameOver(); } void Player::_CMWatchWar(f8::MsgHdr& hdr, const cs::CMWatchWar& msg) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 78d20cb..599ac35 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1282,4 +1282,3 @@ void Room::NotifyWxVoip() }, &xtimer_attacher.timer_list_); } -