From 0a12672889a0ee4b8e718f7649b6a631ad2e3e33 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Fri, 2 May 2025 18:10:27 -0700 Subject: [PATCH 1/2] fix: kracken audio --- dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp index abe9c350..b99b99c4 100644 --- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp +++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp @@ -271,9 +271,11 @@ void SGCannon::DoSpawnTimerFunc(Entity* self, const std::string& name) { new LDFData(u"groupID", u"SGEnemy"), new LDFData(u"wave", self->GetVar(ThisWaveVariable)), }; - auto* enemy = Game::entityManager->CreateEntity(info, nullptr, self); + if (info.lot == 2565) { + LOG("id is %llu", enemy->GetObjectID()); + } auto* movementAI = enemy->AddComponent(MovementAIInfo{}); auto* simplePhysicsComponent = enemy->GetComponent(); if (simplePhysicsComponent) { @@ -612,7 +614,7 @@ void SGCannon::StopGame(Entity* self, bool cancel) { // Destroy all spawners for (auto* entity : Game::entityManager->GetEntitiesInGroup("SGEnemy")) { - entity->Kill(); + entity->Smash(LWOOBJID_EMPTY, eKillType::SILENT); } ResetVars(self); From c9e4cde68d30f9b2737c71e7fe61782a6cfc1919 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Fri, 2 May 2025 18:11:55 -0700 Subject: [PATCH 2/2] Update SGCannon.cpp --- dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp index b99b99c4..14900f67 100644 --- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp +++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp @@ -271,11 +271,9 @@ void SGCannon::DoSpawnTimerFunc(Entity* self, const std::string& name) { new LDFData(u"groupID", u"SGEnemy"), new LDFData(u"wave", self->GetVar(ThisWaveVariable)), }; + auto* enemy = Game::entityManager->CreateEntity(info, nullptr, self); - if (info.lot == 2565) { - LOG("id is %llu", enemy->GetObjectID()); - } auto* movementAI = enemy->AddComponent(MovementAIInfo{}); auto* simplePhysicsComponent = enemy->GetComponent(); if (simplePhysicsComponent) {