server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-06-26 16:30:50 +08:00
parent d78bc4e0de
commit e15d50950a
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/human.h
View File

@ -142,7 +142,6 @@ class Human : public Entity
int target_id); int target_id);
void CancelAction(); void CancelAction();
void ResetAction(); void ResetAction();
void FillSMGameOver(cs::SMGameOver& msg);
void BeKill(int killer_id, const std::string& killer_name, int weapon_id); 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 DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id);
void AddToNewObjects(Entity* entity); void AddToNewObjects(Entity* entity);
@ -205,6 +204,7 @@ private:
void GenBattleReportData(a8::MutableXObject* params); void GenBattleReportData(a8::MutableXObject* params);
void InternalSendGameOver(); void InternalSendGameOver();
void DeadDrop(); void DeadDrop();
void FillSMGameOver(cs::SMGameOver& msg);
protected: protected:
long long last_shot_frameno_ = 0; long long last_shot_frameno_ = 0;

4
server/gameserver/player.cc
View File

@ -1030,9 +1030,7 @@ void Player::_CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg)
void Player::_CMGameOver(f8::MsgHdr& hdr, const cs::CMGameOver& msg) void Player::_CMGameOver(f8::MsgHdr& hdr, const cs::CMGameOver& msg)
{ {
cs::SMGameOver respmsg; SendGameOver();
FillSMGameOver(respmsg);
SendNotifyMsg(respmsg);
} }
void Player::_CMWatchWar(f8::MsgHdr& hdr, const cs::CMWatchWar& msg) void Player::_CMWatchWar(f8::MsgHdr& hdr, const cs::CMWatchWar& msg)

1
server/gameserver/room.cc
View File

@ -1282,4 +1282,3 @@ void Room::NotifyWxVoip()
}, },
&xtimer_attacher.timer_list_); &xtimer_attacher.timer_list_);
} }