From 500576ccf56028ebf729d778d6eedf01783f1a7a Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Thu, 19 Feb 2026 11:24:44 +1100 Subject: [PATCH] bugfix: Prevent using the bombardment cannon while switching battle plans --- .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 4 ++++ .../Source/GameLogic/Object/Update/BattlePlanUpdate.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 0bc8f1ea66b..24620b7352d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -370,6 +370,10 @@ UpdateSleepTime BattlePlanUpdate::update() { //It's not centered, and not trying to center, so order it to center. ai->aiIdle( CMD_FROM_AI ); +#if !RETAIL_COMPATIBLE_CRC + // TheSuperHackers @bugfix Stubbjax 19/02/2026 Prevent using the turret while it recenters. + enableTurret(false); +#endif recenterTurret(); m_centeringTurret = true; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp index 3f19d18ce7a..bce7925e59a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp @@ -371,6 +371,10 @@ UpdateSleepTime BattlePlanUpdate::update() { //It's not centered, and not trying to center, so order it to center. ai->aiIdle( CMD_FROM_AI ); +#if !RETAIL_COMPATIBLE_CRC + // TheSuperHackers @bugfix Stubbjax 19/02/2026 Prevent using the turret while it recenters. + enableTurret(false); +#endif recenterTurret(); m_centeringTurret = true; }