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

1

Browse Source
This commit is contained in:
aozhiwei 2020-05-28 19:46:34 +08:00
parent 05cf12e9b0
commit 45f95035e5
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/human.h
View File

@ -22,7 +22,6 @@ enum HumanStatus
HS_AlreadyShow = 4, HS_AlreadyShow = 4,
HS_AlreadyEquip = 5, HS_AlreadyEquip = 5,
HS_AlreadyProcNewBieLogic = 6, HS_AlreadyProcNewBieLogic = 6,
HS_ForceDie = 7,
HS_End HS_End
}; };

2
server/gameserver/room.cc
View File

@ -2189,7 +2189,6 @@ void Room::ProcDieAndroid(int die_time, int die_num)
killer->name, killer->name,
killer->curr_weapon->weapon_id); killer->curr_weapon->weapon_id);
a8::UnSetBitFlag(hum->status, HS_Disable); a8::UnSetBitFlag(hum->status, HS_Disable);
a8::SetBitFlag(hum->status, HS_ForceDie);
} else { } else {
hum->BeKill(VP_SafeArea, hum->BeKill(VP_SafeArea,
"毒圈", "毒圈",
@ -2199,7 +2198,6 @@ void Room::ProcDieAndroid(int die_time, int die_num)
alive_humans_copy.erase(alive_humans_copy.begin() + i); alive_humans_copy.erase(alive_humans_copy.begin() + i);
} }
a8::UnSetBitFlag(hum->status, HS_Disable); a8::UnSetBitFlag(hum->status, HS_Disable);
a8::SetBitFlag(hum->status, HS_ForceDie);
} }
++dead_num; ++dead_num;
break; break;