fix(update): Extend the height of the USA Particle Cannon laser beam for enormous camera heights (TheSuperHackers#2220)

githubawn · web-flow · commit 26710b99a8a2 · 2026-02-04T23:36:38.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -58,7 +58,9 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-
+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
+// enormous camera heights cannot see above the laser origin.
+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -550,7 +552,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 
 			Coord3D orbitPosition;
 			orbitPosition.set( &m_currentTargetPosition );
-			orbitPosition.z += 500.0f;
+			orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 
 			Real scorchRadius = 0.0f;
 			Real damageRadius = 0.0f;
@@ -918,7 +920,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_laserOriginPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, &m_laserOriginPosition, &orbitPosition, growthFrames );
 				}
 			}
@@ -957,7 +959,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_initialTargetPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, &orbitPosition, &m_initialTargetPosition, growthFrames );
 				}
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -58,7 +58,9 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-
+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
+// enormous camera heights cannot see above the laser origin.
+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -625,7 +627,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 
 			Coord3D orbitPosition;
 			orbitPosition.set( &m_currentTargetPosition );
-			orbitPosition.z += 500.0f;
+			orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 
 			Real scorchRadius = 0.0f;
 			Real damageRadius = 0.0f;
@@ -1003,7 +1005,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_laserOriginPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, nullptr, &m_laserOriginPosition, &orbitPosition, "", growthFrames );
 				}
 			}
@@ -1042,7 +1044,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_initialTargetPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, nullptr, &orbitPosition, &m_initialTargetPosition, "", growthFrames );
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@`
`58`	`58`	`#include "GameLogic/Module/PhysicsUpdate.h"`
`59`	`59`	`#include "GameLogic/Module/ActiveBody.h"`
`60`	`60`
`61`		`-`
	`61`	`+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that`
	`62`	`+// enormous camera heights cannot see above the laser origin.`
	`63`	`+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;`
`62`	`64`
`63`	`65`	`//-------------------------------------------------------------------------------------------------`
`64`	`66`	`//-------------------------------------------------------------------------------------------------`
`@@ -550,7 +552,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()`
`550`	`552`
`551`	`553`	`Coord3D orbitPosition;`
`552`	`554`	`orbitPosition.set( &m_currentTargetPosition );`
`553`		`- orbitPosition.z += 500.0f;`
	`555`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`554`	`556`
`555`	`557`	`Real scorchRadius = 0.0f;`
`556`	`558`	`Real damageRadius = 0.0f;`
`@@ -918,7 +920,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`918`	`920`	`{`
`919`	`921`	`Coord3D orbitPosition;`
`920`	`922`	`orbitPosition.set( &m_laserOriginPosition );`
`921`		`- orbitPosition.z += 500.0f;`
	`923`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`922`	`924`	`update->initLaser( nullptr, &m_laserOriginPosition, &orbitPosition, growthFrames );`
`923`	`925`	`}`
`924`	`926`	`}`
`@@ -957,7 +959,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra`
`957`	`959`	`{`
`958`	`960`	`Coord3D orbitPosition;`
`959`	`961`	`orbitPosition.set( &m_initialTargetPosition );`
`960`		`- orbitPosition.z += 500.0f;`
	`962`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`961`	`963`	`update->initLaser( nullptr, &orbitPosition, &m_initialTargetPosition, growthFrames );`
`962`	`964`	`}`
`963`	`965`	`}`