[GEN][ZH] Fix wrong class member set to INVALID_DRAWABLE_ID in ParticleUplinkCannonUpdate::createGroundToOrbitLaser() (TheSuperHackers#729)

Mauller · helmutbuhler · web-flow · commit 7eb805c68b47 · 2025-04-28T21:45:28.000+02:00
Co-authored-by: Helmut Buhler &lt;buhler@8gadgetpack.net&gt;
diff --git 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
@@ -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() )

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,8 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`870`	`870`	`if( beam )`
`871`	`871`	`{`
`872`	`872`	`TheGameClient->destroyDrawable( beam );`
`873`		`- m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;`
	`873`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025 Invalidate the relevant drawable ID.`
	`874`	`+ m_groundToOrbitBeamID = INVALID_DRAWABLE_ID;`
`874`	`875`	`}`
`875`	`876`
`876`	`877`	`if( data->m_particleBeamLaserName.isNotEmpty() )`
Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,8 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`942`	`942`	`if( beam )`
`943`	`943`	`{`
`944`	`944`	`TheGameClient->destroyDrawable( beam );`
`945`		`- m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;`
	`945`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025 Invalidate the relevant drawable ID.`
	`946`	`+ m_groundToOrbitBeamID = INVALID_DRAWABLE_ID;`
`946`	`947`	`}`
`947`	`948`
`948`	`949`	`if( data->m_particleBeamLaserName.isNotEmpty() )`