From 1752d86e9ae257a895f4a25b42e63ff2ce66dfa8 Mon Sep 17 00:00:00 2001 From: Bobby Battista Date: Mon, 14 Sep 2026 23:19:03 -0400 Subject: [PATCH] fix(saveload): Check version instead of currentVersion in xfer methods --- .../GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp | 4 ++-- .../GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp | 4 ++-- GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp | 4 ++-- .../GameLogic/Object/Behavior/CountermeasuresBehavior.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp index 9dd149c1adf..0c86a4e2da8 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp @@ -308,7 +308,7 @@ void GameStateMap::xfer( Xfer *xfer ) xfer->xferAsciiString( &tmp ); } - if (currentVersion >= 2) + if (version >= 2) { // save the game mode. Int gameMode = (Int)TheGameLogic->getGameMode(); @@ -339,7 +339,7 @@ void GameStateMap::xfer( Xfer *xfer ) xfer->xferAsciiString( &saveGameInfo->pristineMapName ); saveGameInfo->pristineMapName = TheGameState->portableMapPathToRealMapPath(saveGameInfo->pristineMapName); - if (currentVersion >= 2) + if (version >= 2) { // get the game mode. Int gameMode; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp index f503e975f8c..978fd812e51 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp @@ -315,7 +315,7 @@ void GameStateMap::xfer( Xfer *xfer ) xfer->xferAsciiString( &tmp ); } - if (currentVersion >= 2) + if (version >= 2) { // save the game mode. Int gameMode = (Int)TheGameLogic->getGameMode(); @@ -346,7 +346,7 @@ void GameStateMap::xfer( Xfer *xfer ) xfer->xferAsciiString( &saveGameInfo->pristineMapName ); saveGameInfo->pristineMapName = TheGameState->portableMapPathToRealMapPath(saveGameInfo->pristineMapName); - if (currentVersion >= 2) + if (version >= 2) { // get the game mode. Int gameMode; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index e323d96d34d..bc0e09c7d9c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -465,7 +465,7 @@ void InGameUI::xfer( Xfer *xfer ) xfer->xferBool(&swInfo->m_hiddenByScript); xfer->xferBool(&swInfo->m_hiddenByScience); xfer->xferBool(&swInfo->m_ready); - if ( currentVersion >= 3 ) + if ( version >= 3 ) { xfer->xferBool( &swInfo->m_evaReadyPlayed ); } @@ -512,7 +512,7 @@ void InGameUI::xfer( Xfer *xfer ) xfer->xferBool(&hiddenByScript); xfer->xferBool(&hiddenByScience); xfer->xferBool(&ready); - if ( currentVersion >= 3 ) + if ( version >= 3 ) { xfer->xferBool( &evaReadyPlayed ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp index e7dbd7fed5b..93f49141251 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp @@ -390,7 +390,7 @@ void CountermeasuresBehavior::xfer( Xfer *xfer ) // extend base class UpgradeMux::upgradeMuxXfer( xfer ); - if( currentVersion >= 2 ) + if( version >= 2 ) { xfer->xferSTLObjectIDVector( &m_counterMeasures ); xfer->xferUnsignedInt( &m_availableCountermeasures );