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

Author: bobtista

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

@@ -225,8 +225,12 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat
 	UnsignedInt			m_nextDamagePulseFrame;
 	UnsignedInt			m_startAttackFrame;
 	UnsignedInt			m_startDecayFrame;
-	UnsignedInt			m_lastDrivingClickTimeMsec;
-	UnsignedInt			m_2ndLastDrivingClickTimeMsec;
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	UnsignedInt			m_lastDrivingClickFrame;			// Frame number for retail compatibility
+	UnsignedInt			m_2ndLastDrivingClickFrame;		// Frame number for retail compatibility
+#endif
+	UnsignedInt			m_lastDrivingClickTimeMsec;		// Real-time milliseconds
+	UnsignedInt			m_2ndLastDrivingClickTimeMsec;	// Real-time milliseconds
 
 	Bool						m_upBonesCached;
 	Bool						m_defaultInfoCached;

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

@@ -183,6 +183,10 @@ ParticleUplinkCannonUpdate::ParticleUplinkCannonUpdate( Thing *thing, const Modu
 	m_nextDamagePulseFrame = 0;
 	m_startAttackFrame = 0;
 	m_startDecayFrame = 0;
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	m_lastDrivingClickFrame = 0;
+	m_2ndLastDrivingClickFrame = 0;
+#endif
 	m_lastDrivingClickTimeMsec = 0;
 	m_2ndLastDrivingClickTimeMsec = 0;
 	m_clientShroudedLastFrame = FALSE;
@@ -324,6 +328,10 @@ void ParticleUplinkCannonUpdate::setSpecialPowerOverridableDestination( const Co
 	{
 		m_overrideTargetDestination = *loc;
 		m_manualTargetMode = true;
+#if RETAIL_COMPATIBLE_XFER_SAVE
+		m_2ndLastDrivingClickFrame = m_lastDrivingClickFrame;
+		m_lastDrivingClickFrame = TheGameLogic->getFrame();
+#endif
 		m_2ndLastDrivingClickTimeMsec = m_lastDrivingClickTimeMsec;
 		m_lastDrivingClickTimeMsec = timeGetTime();
 	}
@@ -517,7 +525,11 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 			else
 			{
 				Real speed = data->m_manualDrivingSpeed;
+#if !RETAIL_COMPATIBLE_CRC
 				if( m_lastDrivingClickTimeMsec != 0 && m_2ndLastDrivingClickTimeMsec != 0 && m_lastDrivingClickTimeMsec - m_2ndLastDrivingClickTimeMsec < data->m_doubleClickToFastDriveDelay )
+#else
+				if( m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay )
+#endif
 				{
 					//Because we double clicked, use the faster driving speed.
 					speed = data->m_manualFastDrivingSpeed;
@@ -1308,7 +1320,12 @@ void ParticleUplinkCannonUpdate::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Added m_startDecayFrame
+	* 3: Changed m_lastDrivingClickFrame and m_2ndLastDrivingClickFrame to m_lastDrivingClickTimeMsec and m_2ndLastDrivingClickTimeMsec (frames to milliseconds)
+	* 4: Added m_orbitToTargetLaserRadius
+	* 5: (non-retail) Changed m_lastDrivingClickFrame and m_2ndLastDrivingClickFrame to m_lastDrivingClickTimeMsec and m_2ndLastDrivingClickTimeMsec
+	*/
 // ------------------------------------------------------------------------------------------------
 void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 {
@@ -1318,7 +1335,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 #if RETAIL_COMPATIBLE_XFER_SAVE
 	const XferVersion currentVersion = 2;
 #else
-	const XferVersion currentVersion = 4;
+	const XferVersion currentVersion = 5;
 #endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
@@ -1415,10 +1432,38 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 	}
 
 	// the time of last manual target click (milliseconds)
-	xfer->xferUnsignedInt( & m_lastDrivingClickTimeMsec );
-
-	// the time of the 2nd last manual target click (milliseconds)
-	xfer->xferUnsignedInt( &m_2ndLastDrivingClickTimeMsec );
+#if RETAIL_COMPATIBLE_XFER_SAVE
+	// Retail builds stay at version 2 for compatibility, so always use old frame format
+	xfer->xferUnsignedInt( & m_lastDrivingClickFrame );
+	xfer->xferUnsignedInt( &m_2ndLastDrivingClickFrame );
+#if !RETAIL_COMPATIBLE_CRC
+	if( xfer->getXferMode() == XFER_LOAD )
+	{
+		// Can't convert frames to milliseconds accurately, so set to 0
+		m_lastDrivingClickTimeMsec = 0;
+		m_2ndLastDrivingClickTimeMsec = 0;
+	}
+#endif
+#else
+	if( version >= 5 )
+	{
+		xfer->xferUnsignedInt( & m_lastDrivingClickTimeMsec );
+		xfer->xferUnsignedInt( &m_2ndLastDrivingClickTimeMsec );
+	}
+	else
+	{
+		// Old versions stored frame numbers, which we can't meaningfully convert to milliseconds
+		UnsignedInt oldLastDrivingClickFrame = 0;
+		UnsignedInt old2ndLastDrivingClickFrame = 0;
+		xfer->xferUnsignedInt( &oldLastDrivingClickFrame );
+		xfer->xferUnsignedInt( &old2ndLastDrivingClickFrame );
+		if( xfer->getXferMode() == XFER_LOAD )
+		{
+			m_lastDrivingClickTimeMsec = 0;
+			m_2ndLastDrivingClickTimeMsec = 0;
+		}
+	}
+#endif
 
 	if( version >= 4 )
 	{