From 45f95035e5286b7443f3d5caf7dd8bdf8faee68e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 28 May 2020 19:46:34 +0800 Subject: [PATCH] 1 --- server/gameserver/human.h | 1 - server/gameserver/room.cc | 2 -- 2 files changed, 3 deletions(-) diff --git a/server/gameserver/human.h b/server/gameserver/human.h index b970b02..f7a844f 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -22,7 +22,6 @@ enum HumanStatus HS_AlreadyShow = 4, HS_AlreadyEquip = 5, HS_AlreadyProcNewBieLogic = 6, - HS_ForceDie = 7, HS_End }; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 00f58b1..4464cd6 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2189,7 +2189,6 @@ void Room::ProcDieAndroid(int die_time, int die_num) killer->name, killer->curr_weapon->weapon_id); a8::UnSetBitFlag(hum->status, HS_Disable); - a8::SetBitFlag(hum->status, HS_ForceDie); } else { 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); } a8::UnSetBitFlag(hum->status, HS_Disable); - a8::SetBitFlag(hum->status, HS_ForceDie); } ++dead_num; break;