From 84444872f23e193ceeba162da7aba00101913fd1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 May 2020 19:49:23 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 2 +- server/gameserver/roommgr.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index a459a87..9bdf93a 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -148,7 +148,7 @@ int Room::AliveCount() void Room::AddPlayer(Player* hum) { - if (gas_data_.gas_mode == GasInactive) { + if (gas_data_.gas_mode != GasInactive) { abort(); } hum->born_point = AllocBornPoint(hum); diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 903fe09..e22e63d 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -32,7 +32,7 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg) int game_times = a8::XValue(tmp_strings[0]); if (!f8::IsOnlineEnv()) { #if 1 - game_times = 1; + game_times = 0; #endif if (!msg.team_uuid().empty()) { game_times = 1;