[GEN][ZH] Fix ParticleUplinkCannonUpdate mismatch, introduced by previous refactoring (#1012)

xezon · web-flow · commit 2856a23ca78e · 2025-06-06T00:05:32.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -455,7 +455,8 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				break;
 		}
 
-		if( orbitalBirthFrame <= now && now < orbitalDeathFrame )
+		const Bool isFiring = m_laserStatus != LASERSTATUS_NONE && m_laserStatus != LASERSTATUS_DEAD;
+		if ( isFiring )
 		{
 		
 			if( !m_manualTargetMode )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -502,7 +502,8 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 				break;
 		}
 
-		if( orbitalBirthFrame <= now && now < orbitalDeathFrame )
+		const Bool isFiring = m_laserStatus != LASERSTATUS_NONE && m_laserStatus != LASERSTATUS_DEAD;
+		if ( isFiring )
 		{
 		
 			if( !m_manualTargetMode && !m_scriptedWaypointMode )

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,8 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()`
`455`	`455`	`break;`
`456`	`456`	`}`
`457`	`457`
`458`		`- if( orbitalBirthFrame <= now && now < orbitalDeathFrame )`
	`458`	`+ const Bool isFiring = m_laserStatus != LASERSTATUS_NONE && m_laserStatus != LASERSTATUS_DEAD;`
	`459`	`+ if ( isFiring )`
`459`	`460`	`{`
`460`	`461`
`461`	`462`	`if( !m_manualTargetMode )`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,8 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()`
`502`	`502`	`break;`
`503`	`503`	`}`
`504`	`504`
`505`		`- if( orbitalBirthFrame <= now && now < orbitalDeathFrame )`
	`505`	`+ const Bool isFiring = m_laserStatus != LASERSTATUS_NONE && m_laserStatus != LASERSTATUS_DEAD;`
	`506`	`+ if ( isFiring )`
`506`	`507`	`{`
`507`	`508`
`508`	`509`	`if( !m_manualTargetMode && !m_scriptedWaypointMode )`