[GEN][ZH] Fix invalid drawable ID being set on m_orbitToTargetBeamID instead of m_groundToOrbitBeamID

Mauller · helmutbuhler · Mauller · commit 750c55213936 · 2025-04-23T07:34:51.000+01: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,10 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 	if( beam )
 	{
 		TheGameClient->destroyDrawable( beam );
-		m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;
+
+		// TheSuperHackers @fix helmutbuhler 19/04/2025
+		// This originally mistakenly assigned to m_orbitToTargetBeamID and thus caused a leak.
+		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,10 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 	if( beam )
 	{
 		TheGameClient->destroyDrawable( beam );
-		m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;
+
+		// TheSuperHackers @fix helmutbuhler 19/04/2025
+		// This originally mistakenly assigned to m_orbitToTargetBeamID and thus caused a leak.
+		m_groundToOrbitBeamID = INVALID_DRAWABLE_ID;
 	}
 
 	if( data->m_particleBeamLaserName.isNotEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,10 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`870`	`870`	`if( beam )`
`871`	`871`	`{`
`872`	`872`	`TheGameClient->destroyDrawable( beam );`
`873`		`- m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;`
	`873`	`+`
	`874`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025`
	`875`	`+ // This originally mistakenly assigned to m_orbitToTargetBeamID and thus caused a leak.`
	`876`	`+ m_groundToOrbitBeamID = INVALID_DRAWABLE_ID;`
`874`	`877`	`}`
`875`	`878`
`876`	`879`	`if( data->m_particleBeamLaserName.isNotEmpty() )`
Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,10 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`942`	`942`	`if( beam )`
`943`	`943`	`{`
`944`	`944`	`TheGameClient->destroyDrawable( beam );`
`945`		`- m_orbitToTargetBeamID = INVALID_DRAWABLE_ID;`
	`945`	`+`
	`946`	`+ // TheSuperHackers @fix helmutbuhler 19/04/2025`
	`947`	`+ // This originally mistakenly assigned to m_orbitToTargetBeamID and thus caused a leak.`
	`948`	`+ m_groundToOrbitBeamID = INVALID_DRAWABLE_ID;`
`946`	`949`	`}`
`947`	`950`
`948`	`951`	`if( data->m_particleBeamLaserName.isNotEmpty() )`