diff --git a/server/gameserver/airraid.cc b/server/gameserver/airraid.cc index f19490db..98c7a7da 100644 --- a/server/gameserver/airraid.cc +++ b/server/gameserver/airraid.cc @@ -106,18 +106,12 @@ bool AirRaid::GenAirRaidPos(const mt::AirRaid* raid_meta, glm::vec3& center) center = glm::vec3(v2_center.x, 0.0f, v2_center.y); { std::vector humans; - #if 0 room_->GetAlivePlayers(humans, room_->GetRoomMaxPlayerNum()); - #endif if (humans.size() > 3) { std::random_shuffle(humans.begin(), humans.end()); for (Human* hum : humans) { if (!hum->poisoning) { - // 99 - #if 1 - #else - center = hum->GetPos() + dir * (200 + rand() % 500); - #endif + center = hum->GetPos().ToGlmVec3() + dir * (float)(200 + rand() % 500); break; } } diff --git a/server/gameserver/room.h b/server/gameserver/room.h index e3b3ca81..ff04f40c 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -216,6 +216,7 @@ public: void RemoveTask(int task_uniid); const mt::AirLine* GetAirLine() { return airline_; } int GetPolyExtFlag(int poly_idx); + size_t GetRoomMaxPlayerNum(); private: void ShuaAndroid(); @@ -286,7 +287,6 @@ private: void CheckShowHand(); void ShowHand(); void ShuaLastGas(); - size_t GetRoomMaxPlayerNum(); void InitAndroidAI(); void ForwardGasRing(int n); void InternalRemoveObjectLater(Entity* entity, a8::Attacher& entity_xtimer_attacher);