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-10-08 17:12:46 +08:00
parent a5329d2d4d
commit 286e5831eb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/handlermgr.cc
View File

@ -90,6 +90,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMGameOver);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMWatchWar);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMLeave);
RegisterNetMsgHandler(&ggmsghandler, &Player::_CMRevive);
}
void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,

3
server/gameserver/human.cc
View File

@ -2353,7 +2353,7 @@ void Human::OnDie()
if (member == this) {
member->SendGameOver();
} else {
if (member->dead) {
if (member->real_dead) {
member->SendGameOver();
} else if (member->downed) {
a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer);
@ -2361,6 +2361,7 @@ void Human::OnDie()
member->stats.killer_name = timer_param->param2.GetString();
member->stats.weapon_id = timer_param->param2;
member->dead = true;
member->real_dead = true;
member->health = 0.0f;
member->dead_frameno = room->frame_no;
member->room->OnHumanDie(this);

6
server/gameserver/room.cc
View File

@ -709,7 +709,7 @@ int Room::GetAliveTeamNum()
int num = 0;
for (auto& pair : team_hash_) {
for (Human* hum : pair.second) {
if (!hum->dead) {
if (!hum->real_dead) {
++num;
break;
}
@ -833,7 +833,7 @@ std::set<Human*>* Room::GetAliveTeam()
{
for (auto& pair : team_hash_) {
for (Human* hum : pair.second) {
if (!hum->dead) {
if (!hum->real_dead) {
return &pair.second;
}
}
@ -914,7 +914,7 @@ void Room::UpdateGas()
OnGameOver();
}
for (auto& pair : human_hash_) {
if (pair.second->dead) {
if (pair.second->real_dead) {
continue;
}
bool b1 = a8::CircleContainCircle(gas_data.pos_old,