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-11-06 19:09:00 +08:00
parent a3c4164a72
commit e9c96a209d
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
server/gameserver/human.cc
View File

@ -2363,32 +2363,36 @@ void Human::OnDie()
} }
} }
} }
if (!HasNoDownedTeammate() && !leave_) { if (!leave_) {
if (team_members) { if (!HasNoDownedTeammate()) {
for (auto& member : *team_members) { if (team_members) {
if (member == this) { for (auto& member : *team_members) {
member->SendGameOver(); if (member == this) {
} else {
if (member->real_dead) {
member->SendGameOver(); member->SendGameOver();
} else if (member->downed) { } else {
a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer); if (member->real_dead) {
member->stats.killer_id = timer_param->param1; member->SendGameOver();
member->stats.killer_name = timer_param->param2.GetString(); } else if (member->downed) {
member->stats.weapon_id = timer_param->param2; a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer);
member->dead = true; member->stats.killer_id = timer_param->param1;
member->real_dead = true; member->stats.killer_name = timer_param->param2.GetString();
member->health = 0.0f; member->stats.weapon_id = timer_param->param2;
member->dead_frameno = room->frame_no; member->dead = true;
member->room->OnHumanDie(this); member->real_dead = true;
member->SyncAroundPlayers(__FILE__, __LINE__, __func__); member->health = 0.0f;
member->SendGameOver(); member->dead_frameno = room->frame_no;
if (member->downed_timer) { member->room->OnHumanDie(this);
room->xtimer.DeleteTimer(member->downed_timer); member->SyncAroundPlayers(__FILE__, __LINE__, __func__);
member->SendGameOver();
if (member->downed_timer) {
room->xtimer.DeleteTimer(member->downed_timer);
}
member->downed_timer = nullptr;
} }
member->downed_timer = nullptr;
} }
} }
} else {
SendGameOver();
} }
} else { } else {
SendGameOver(); SendGameOver();