fix(input): Replicate double-click fast drive timing fix to Generals

Author: bobtista

Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h

@@ -225,8 +225,8 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat
 	UnsignedInt			m_nextDamagePulseFrame;
 	UnsignedInt			m_startAttackFrame;
 	UnsignedInt			m_startDecayFrame;
-	UnsignedInt			m_lastDrivingClickFrame;
-	UnsignedInt			m_2ndLastDrivingClickFrame;
+	UnsignedInt			m_lastDrivingClickTimeMsec;
+	UnsignedInt			m_2ndLastDrivingClickTimeMsec;
 
 	Bool						m_upBonesCached;
 	Bool						m_defaultInfoCached;

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

@@ -183,8 +183,8 @@ ParticleUplinkCannonUpdate::ParticleUplinkCannonUpdate( Thing *thing, const Modu
 	m_nextDamagePulseFrame = 0;
 	m_startAttackFrame = 0;
 	m_startDecayFrame = 0;
-	m_lastDrivingClickFrame = 0;
-	m_2ndLastDrivingClickFrame = 0;
+	m_lastDrivingClickTimeMsec = 0;
+	m_2ndLastDrivingClickTimeMsec = 0;
 	m_clientShroudedLastFrame = FALSE;
 
 	for( Int i = 0; i < MAX_OUTER_NODES; i++ )
@@ -324,8 +324,8 @@ void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Co
 	{
 		m_overrideTargetDestination = *loc;
 		m_manualTargetMode = true;
-		m_2ndLastDrivingClickFrame = m_lastDrivingClickFrame;
-		m_lastDrivingClickFrame = TheGameLogic->getFrame();
+		m_2ndLastDrivingClickTimeMsec = m_lastDrivingClickTimeMsec;
+		m_lastDrivingClickTimeMsec = timeGetTime();
 	}
 }
 
@@ -517,7 +517,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 			else
 			{
 				Real speed = data->m_manualDrivingSpeed;
-				if( m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay )
+				if( m_lastDrivingClickTimeMsec != 0 && m_2ndLastDrivingClickTimeMsec != 0 && m_lastDrivingClickTimeMsec - m_2ndLastDrivingClickTimeMsec < data->m_doubleClickToFastDriveDelay )
 				{
 					//Because we double clicked, use the faster driving speed.
 					speed = data->m_manualFastDrivingSpeed;
@@ -1414,11 +1414,11 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 		m_startDecayFrame = m_startAttackFrame + data->m_totalFiringFrames;
 	}
 
-	// the time of last manual target click
-	xfer->xferUnsignedInt( & m_lastDrivingClickFrame );
+	// the time of last manual target click (milliseconds)
+	xfer->xferUnsignedInt( & m_lastDrivingClickTimeMsec );
 
-	// the time of the 2nd last manual target click
-	xfer->xferUnsignedInt( &m_2ndLastDrivingClickFrame );
+	// the time of the 2nd last manual target click (milliseconds)
+	xfer->xferUnsignedInt( &m_2ndLastDrivingClickTimeMsec );
 
 	if( version >= 4 )
 	{