From a4252de74d2ebc90994b8d968adcd9542ea3af84 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 29 May 2020 10:05:49 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc    | 26 --------------------------
 server/gameserver/roommgr.cc |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index f5dc408..0f164bf 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2085,9 +2085,6 @@ void Room::ProcShuaAndroid(int shua_time, int shua_num)
                 }
             }
             hum->SetPos(pos);
-            #if 0
-            a8::SetBitFlag(hum->status, HS_NewBieNpc);
-            #endif
             EnableHuman(hum);
             xtimer.AddDeadLineTimerAndAttach
                 (
@@ -2262,29 +2259,6 @@ void Room::CheckAutoDie(Human* target,
                                    hum->name,
                                    hum->curr_weapon->weapon_id);
                 }
-                #if 0
-                hum->SetPos(target->GetPos());
-                EnableHuman(hum);
-                xtimer.AddDeadLineTimerAndAttach
-                    (
-                     SERVER_FRAME_RATE * autodie_time,
-                     a8::XParams()
-                     .SetSender(hum)
-                     .SetParam1(autodie_time)
-                     .SetParam2(autodie_distance)
-                     .SetParam3(0),
-                     [] (const a8::XParams& param)
-                     {
-                         Human* hum = (Human*)param.sender.GetUserData();
-                         hum->room->CheckAutoDie(
-                                                 hum,
-                                                 param.param1,
-                                                 param.param2,
-                                                 param.param3
-                                                 );
-                     },
-                     &hum->xtimer_attacher.timer_list_);
-                #endif
                 break;
             }
         }
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index a34dff0..cb59b88 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -31,7 +31,9 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg)
     //游戏次数,吃鸡数,击杀数
     int game_times = a8::XValue(tmp_strings[0]);
     if (!f8::IsOnlineEnv()) {
-        game_times = 0;
+        #if 1
+        game_times = 1;
+        #endif
         if (!msg.team_uuid().empty()) {
             game_times = 1;
         }