diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index fafd6c3c..5019b643 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -243,6 +243,10 @@ void Incubator::ActiveAndroid(Human* hum, Human* android) void Incubator::SpawnWaveMon(int wave) { + if (room->IsGameOver()) { + return; + } + room->OnEnterNewWave(wave); if (wave < 0) { abort(); } @@ -257,9 +261,6 @@ void Incubator::SpawnWaveMon(int wave) if (wave > 0 && room->IsDestoryRoom()) { return; } - if (room->IsGameOver()) { - return; - } auto& mons = room->pve_mode_meta->waves[wave]; for (MetaData::PveGeminiContent* content : mons) { room->xtimer.AddDeadLineTimerAndAttach diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index fc77ea9e..e9ef939d 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1311,7 +1311,7 @@ void Room::UpdateGasInactivePvp() void Room::UpdateGasInactivePve() { { - first_safearea = pve_mode_meta->area[0]; + auto first_safearea = pve_mode_meta->area[0]; gas_data_.gas_mode = GasWaiting; gas_data_.gas_start_frameno = GetFrameNo(); battle_start_frameno_ = GetFrameNo(); @@ -4101,3 +4101,8 @@ bool Room::IsSurvivalRoom() { return GetMapMeta()->i->map_id() == 1003; } + +void Room::OnEnterNewWave(int wave) +{ + +} diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 7aa3f1ab..603bfc29 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -141,6 +141,7 @@ public: Entity* GetEntityByUniId(int uniid); Human* GetHumanByUniId(int uniid); int GetRealPlayerNum() { return accountid_hash_.size();} + void OnEnterNewWave(int wave); Player* NewPlayer(); void AddPlayer(Player* hum, BornPoint* init_born_point = nullptr, bool no_matchteam = false);