From 1459d93e88f03ad4e9a384e4b8497eb1386ee65b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 16 Apr 2021 15:29:02 +0800 Subject: [PATCH] 1 --- server/gameserver/incubator.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index 64335ad..0e117bf 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -20,7 +20,6 @@ void Incubator::AllocAndroid(Human* target, int num) if (room->xtimer.GetRunningTimer() == nullptr) { abort(); } - num = 1; int try_count = 0; a8::Vec2 dir = a8::Vec2::UP; while (num > 0 && try_count < 20 && !hold_humans_.empty()) { @@ -117,9 +116,6 @@ void Incubator::RecycleAndroid(Human* hum) bool Incubator::CanSet(Human* hum, Human* exclude_hum) { - #if 1 - return true; - #endif Human* target = hum; bool can_set = true; room->TouchAlivePlayers