diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index fbcbf64..6d070a0 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -952,6 +952,31 @@ void Room::UpdateGasInactive() { if (frame_no - gas_data.gas_start_frameno >= MetaMgr::Instance()->gas_inactive_time * SERVER_FRAME_RATE) { + #if 1 + gas_data.gas_mode = GasWaiting; + gas_data.old_area_meta = MetaMgr::Instance()->GetSafeArea(30001); + gas_data.new_area_meta = MetaMgr::Instance()->GetSafeArea(30002); + gas_data.gas_progress = gas_data.old_area_meta->i->rad(); + gas_data.gas_start_frameno = frame_no; + gas_data.pos_old = a8::Vec2(map_meta->i->map_width() / 2.0f, + map_meta->i->map_height() / 2.0f); + gas_data.pos_old_bk = gas_data.pos_old; + { + bool gen_ok = GenSmallCircle(gas_data.pos_old, + gas_data.old_area_meta->i->rad(), + gas_data.new_area_meta->i->rad(), + gas_data.pos_new); + assert(gen_ok); + } + gas_data.rad_old = gas_data.old_area_meta->i->rad(); + gas_data.rad_new = gas_data.new_area_meta->i->rad(); + battle_start_frameno_ = frame_no; + if (human_hash_.size() < ROOM_MAX_PLAYER_NUM) { + CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size()); + NotifyUiUpdate(); + } + CombineTeam(); + #else gas_data.gas_mode = GasJump; gas_data.gas_start_frameno = frame_no; if (human_hash_.size() < ROOM_MAX_PLAYER_NUM) { @@ -991,6 +1016,7 @@ void Room::UpdateGasInactive() } }, &xtimer_attacher.timer_list_); + #endif } }