From a809f36548526ece966a0a3069b04b2c913c99a6 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Thu, 11 May 2023 09:23:48 -0500 Subject: [PATCH] Address feedback --- dGame/dGameMessages/GameMessages.cpp | 5 +---- dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index 7ebbf761..165876ff 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -6215,8 +6215,5 @@ void GameMessages::HandleRequestActivityExit(RakNet::BitStream* inStream, Entity inStream->Read(player_id); auto player = EntityManager::Instance()->GetEntity(player_id); if (!entity || !player) return; - - for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) { - shootingGallery->RequestActivityExit(entity, player_id, true); - } + entity->RequestActivityExit(entity, player_id, canceled); } diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h index f4202773..b20fae6d 100644 --- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h +++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h @@ -67,7 +67,7 @@ public: void OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) override; void OnActivityTimerDone(Entity* self, const std::string& name) override; void OnActivityTimerUpdate(Entity* self, const std::string& name, float_t timeRemaining, float_t elapsedTime) override; - void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled); + void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled) override; private: static std::vector> GetWaves(); static SGConstants GetConstants();