Skip to content

fix(saveload): Check version instead of currentVersion in xfer methods #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bobtista wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(saveload): Check version instead of currentVersion in xfer methods #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
Loading