Replicate in Generals

Author: xezon

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

@@ -228,6 +228,8 @@ class ParticleUplinkCannonUpdate : public UpdateModule, public SpecialPowerUpdat
 	UnsignedInt			m_lastDrivingClickFrame;
 	UnsignedInt			m_2ndLastDrivingClickFrame;
 
+	XferVersion			m_xferVersion;
+
 	Bool						m_upBonesCached;
 	Bool						m_defaultInfoCached;
 	Bool						m_invalidSettings;

Generals/Code/GameEngine/Source/Common/RTS/Money.cpp

@@ -152,7 +152,8 @@ void Money::crc( Xfer *xfer )
 /** Xfer method
 	* Version Info:
 	* 1: Initial version
-	* 2: Add saveload support for the cash per minute income tracking */
+	* 2: TheSuperHackers @tweak Serialize income tracking
+	*/
 // ------------------------------------------------------------------------------------------------
 void Money::xfer( Xfer *xfer )
 {
@@ -196,7 +197,7 @@ void Money::loadPostProcess( void )
 // ------------------------------------------------------------------------------------------------
 void Money::parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData )
 {
-  // Someday, maybe, have mulitple fields like Gold:10000 Wood:1000 Tiberian:10
+  // Someday, maybe, have multiple fields like Gold:10000 Wood:1000 Tiberian:10
   Money * money = (Money *)store;
 	UnsignedInt moneyAmount;
 	INI::parseUnsignedInt( ini, instance, &moneyAmount, userData );

Generals/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -4858,7 +4858,9 @@ void TintEnvelope::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /** Xfer Method
 	* Version Info;
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: TheSuperHackers @tweak Serialize sustain counter as float instead of integer
+	*/
 // ------------------------------------------------------------------------------------------------
 void TintEnvelope::xfer( Xfer *xfer )
 {

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp

@@ -208,7 +208,10 @@ void PoisonedBehavior::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Serialize death type
+	* 3: TheSuperHackers @tweak Serialize poison source
+	*/
 // ------------------------------------------------------------------------------------------------
 void PoisonedBehavior::xfer( Xfer *xfer )
 {
@@ -239,12 +242,10 @@ void PoisonedBehavior::xfer( Xfer *xfer )
 		xfer->xferUser(&m_deathType, sizeof(m_deathType));
 	}
 
-#if !RETAIL_COMPATIBLE_XFER_SAVE
 	if (version >= 3)
 	{
 		xfer->xferObjectID(&m_poisonSource);
 	}
-#endif
 }
 
 // ------------------------------------------------------------------------------------------------

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

@@ -285,7 +285,9 @@ void FlammableUpdate::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2. TheSuperHackers @tweak Serialize flame source
+	*/
 // ------------------------------------------------------------------------------------------------
 void FlammableUpdate::xfer( Xfer *xfer )
 {
@@ -320,12 +322,10 @@ void FlammableUpdate::xfer( Xfer *xfer )
 	// last flame damage dealt
 	xfer->xferUnsignedInt( &m_lastFlameDamageDealt );
 
-#if !RETAIL_COMPATIBLE_XFER_SAVE
 	if (version >= 2)
 	{
 		xfer->xferObjectID(&m_flameSource);
 	}
-#endif
 }
 
 // ------------------------------------------------------------------------------------------------

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

@@ -173,6 +173,7 @@ ParticleUplinkCannonUpdate::ParticleUplinkCannonUpdate( Thing *thing, const Modu
 	m_defaultInfoCached = false;
 	m_invalidSettings = false;
 	m_manualTargetMode = false;
+	m_xferVersion = 1;
 	m_initialTargetPosition.zero();
 	m_currentTargetPosition.zero();
 	m_overrideTargetDestination.zero();
@@ -1308,7 +1309,10 @@ void ParticleUplinkCannonUpdate::crc( Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:
-	* 1: Initial version */
+	* 1: Initial version
+	* 2: Serialize decay frames
+	* 4: TheSuperHackers @tweak Serialize orbit to target laser radius
+	*/
 // ------------------------------------------------------------------------------------------------
 void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 {
@@ -1322,6 +1326,7 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
 #endif
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
+	m_xferVersion = version;
 
 	// extend base class
 	UpdateModule::xfer( xfer );
@@ -1436,27 +1441,28 @@ void ParticleUplinkCannonUpdate::loadPostProcess( void )
 	// extend base class
 	UpdateModule::loadPostProcess();
 
-#if RETAIL_COMPATIBLE_XFER_SAVE
-	// TheSuperHackers @info xezon 17/05/2025
-	// For retail game compatibility, this transfers the loaded visual laser radius
-	// settings from the Drawable's LaserUpdate to the local LaserRadiusUpdate.
-	if( m_orbitToTargetBeamID != INVALID_DRAWABLE_ID )
+	if (m_xferVersion <= 3)
 	{
-		Drawable* drawable = TheGameClient->findDrawableByID( m_orbitToTargetBeamID );
-		if( drawable != NULL )
+		// TheSuperHackers @info xezon 17/05/2025
+		// For retail game compatibility, this transfers the loaded visual laser radius
+		// settings from the Drawable's LaserUpdate to the local LaserRadiusUpdate.
+		if( m_orbitToTargetBeamID != INVALID_DRAWABLE_ID )
 		{
-			static NameKeyType nameKeyClientUpdate = NAMEKEY( "LaserUpdate" );
-			LaserUpdate *update = (LaserUpdate*)drawable->findClientUpdateModule( nameKeyClientUpdate );
-			if( update != NULL )
+			Drawable* drawable = TheGameClient->findDrawableByID( m_orbitToTargetBeamID );
+			if( drawable != NULL )
 			{
-				m_orbitToTargetLaserRadius = update->getLaserRadiusUpdate();
+				static NameKeyType nameKeyClientUpdate = NAMEKEY( "LaserUpdate" );
+				LaserUpdate *update = (LaserUpdate*)drawable->findClientUpdateModule( nameKeyClientUpdate );
+				if( update != NULL )
+				{
+					m_orbitToTargetLaserRadius = update->getLaserRadiusUpdate();
+				}
+			}
+			else
+			{
+				DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID" ));
 			}
-		}
-		else
-		{
-			DEBUG_CRASH(( "ParticleUplinkCannonUpdate::loadPostProcess - Unable to find drawable for m_orbitToTargetBeamID" ));
 		}
 	}
-#endif
 
 }