Skip to content

Commit a8c703f

Browse files
authored
[ZH] Fix USA Particle Cannon performing incorrect firing sequence after it was scripted to fire along a waypoint path (#1207)
1 parent 0012636 commit a8c703f

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,9 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
287287
m_startAttackFrame = TheGameLogic->getFrame();
288288
m_laserStatus = LASERSTATUS_NONE;
289289
m_manualTargetMode = TRUE;
290+
#if !RETAIL_COMPATIBLE_CRC
291+
m_scriptedWaypointMode = FALSE;
292+
#endif
290293
m_initialTargetPosition.set( targetPos );
291294
m_overrideTargetDestination.set( targetPos );
292295
m_currentTargetPosition.set( targetPos );
@@ -306,6 +309,9 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
306309
pos.set( targetObj->getPosition() );
307310
}
308311
m_startAttackFrame = max( now, (UnsignedInt)1 );
312+
#if !RETAIL_COMPATIBLE_CRC
313+
m_manualTargetMode = FALSE;
314+
#endif
309315
m_scriptedWaypointMode = TRUE;
310316
m_laserStatus = LASERSTATUS_NONE;
311317
setLogicalStatus( STATUS_READY_TO_FIRE );
@@ -338,6 +344,10 @@ Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPow
338344
{
339345
pos.set( targetObj->getPosition() );
340346
}
347+
#if !RETAIL_COMPATIBLE_CRC
348+
m_manualTargetMode = FALSE;
349+
m_scriptedWaypointMode = FALSE;
350+
#endif
341351
m_initialTargetPosition.set( &pos );
342352
m_startAttackFrame = max( now, (UnsignedInt)1 );
343353
m_laserStatus = LASERSTATUS_NONE;

0 commit comments

Comments
 (0)