From e0c4fc9829d77cd368d4ab3e1f769dba287ab8fd Mon Sep 17 00:00:00 2001 From: Mauller <26652186+Mauller@users.noreply.github.com> Date: Sun, 20 Apr 2025 18:36:18 +0100 Subject: [PATCH] [GEN][ZH] Fix drawable ID being invalidated on m_orbitToTargetBeamID instead of m_groundToOrbitBeamID Co-authored-by: Helmut Buhler --- .../GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp | 3 ++- .../GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index b1ae089b6a3..3b7fe0658ab 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp @@ -870,7 +870,8 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra if( beam ) { TheGameClient->destroyDrawable( beam ); - m_orbitToTargetBeamID = INVALID_DRAWABLE_ID; + // TheSuperHackers @fix helmutbuhler 19/04/2025 Invalidate the relevant drawable ID. + m_groundToOrbitBeamID = INVALID_DRAWABLE_ID; } if( data->m_particleBeamLaserName.isNotEmpty() ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index ea56a2e4da8..3dab2f9e0e7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp @@ -942,7 +942,8 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra if( beam ) { TheGameClient->destroyDrawable( beam ); - m_orbitToTargetBeamID = INVALID_DRAWABLE_ID; + // TheSuperHackers @fix helmutbuhler 19/04/2025 Invalidate the relevant drawable ID. + m_groundToOrbitBeamID = INVALID_DRAWABLE_ID; } if( data->m_particleBeamLaserName.isNotEmpty() )