Skip to content

bugfix(savegame): Guard GameLogic xfer version bump with RETAIL_COMPATIBLE_XFER_SAVE #2418

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

Open
bobtista wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bugfix(savegame): Guard GameLogic xfer version bump with RETAIL_COMPATIBLE_XFER_SAVE #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b54c8ec
bugfix(savegame): Guard GameLogic xfer version bump with RETAIL_COMPA…
bobtista Mar 7, 2026
805d193
bugfix(savegame): Guard GameLogic xfer version bump with RETAIL_COMPA…
bobtista Mar 7, 2026
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
19 changes: 13 additions & 6 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,14 +4244,18 @@ void GameLogic::prepareLogicForObjectLoad()
* this version breaks compatibility with previous versions. (CBD)
* 5: Added xfering the BuildAssistant's sell list.
* 9: Added m_rankPointsToAddAtGameStart, or else on a load game, your RestartGame button will forget your exp
* 10: TheSuperHackers @tweak Save objects in reverse order so they load in correct order. Reverse object list for old saves.
* 10: TheSuperHackers @fix Save objects in reverse order so they load in correct order
*/
// ------------------------------------------------------------------------------------------------
void GameLogic::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 9;
#else
const XferVersion currentVersion = 10;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand Down Expand Up @@ -4284,14 +4288,17 @@ void GameLogic::xfer( Xfer *xfer )
ObjectTOCEntry *tocEntry;
if( xfer->getXferMode() == XFER_SAVE )
{

// TheSuperHackers @fix bobtista 27/01/2026 Save objects in reverse order (newest first)
#if !RETAIL_COMPATIBLE_XFER_SAVE
// TheSuperHackers @fix bobtista 07/03/2026 Save objects in reverse order (newest first)
// so they load in the correct order (oldest objects at head of list).
Object *lastObj = nullptr;
for( obj = getFirstObject(); obj; obj = obj->getNextObject() )
lastObj = obj;

for( obj = lastObj; obj; obj = obj->getPrevObject() )
#else
for( obj = getFirstObject(); obj; obj = obj->getNextObject() )
#endif
{

// get the object TOC entry for this template
Expand Down Expand Up @@ -4374,9 +4381,9 @@ void GameLogic::xfer( Xfer *xfer )

}

// TheSuperHackers @fix bobtista 27/01/2026 Reverse object list for old saves.
// Old saves stored objects oldest-first, which results in reversed order when loaded
// since objects are prepended during creation. Version 10+ saves in reverse order.
// TheSuperHackers @fix bobtista 07/03/2026 Reverse object list after load.
// Objects are prepended during creation, which reverses the saved order.
// Version 10+ saves in reverse order so they load in the correct order.
if ( version <= 9 )
{
Object *prev = nullptr;
Expand Down
18 changes: 13 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4804,14 +4804,18 @@ void GameLogic::prepareLogicForObjectLoad()
* 5: Added xfering the BuildAssistant's sell list.
* 9: Added m_rankPointsToAddAtGameStart, or else on a load game, your RestartGame button will forget your exp
* 10: xfer m_superweaponRestriction
* 11: TheSuperHackers @tweak Save objects in reverse order so they load in correct order
* 11: TheSuperHackers @fix Save objects in reverse order so they load in correct order
*/
// ------------------------------------------------------------------------------------------------
void GameLogic::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 10;
#else
const XferVersion currentVersion = 11;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand Down Expand Up @@ -4844,13 +4848,17 @@ void GameLogic::xfer( Xfer *xfer )
ObjectTOCEntry *tocEntry;
if( xfer->getXferMode() == XFER_SAVE )
{
// TheSuperHackers @fix bobtista 27/01/2026 Save objects in reverse order (newest first)
#if !RETAIL_COMPATIBLE_XFER_SAVE
// TheSuperHackers @fix bobtista 07/03/2026 Save objects in reverse order (newest first)
// so they load in the correct order (oldest objects at head of list).
Object *lastObj = nullptr;
for( obj = getFirstObject(); obj; obj = obj->getNextObject() )
lastObj = obj;

for( obj = lastObj; obj; obj = obj->getPrevObject() )
#else
for( obj = getFirstObject(); obj; obj = obj->getNextObject() )
#endif
{

// get the object TOC entry for this template
Expand Down Expand Up @@ -4933,9 +4941,9 @@ void GameLogic::xfer( Xfer *xfer )

}

// TheSuperHackers @fix bobtista 27/01/2026 Reverse object list for old saves.
// Old saves stored objects oldest-first, which results in reversed order when loaded
// since objects are prepended during creation. Version 11+ saves in reverse order.
// TheSuperHackers @fix bobtista 07/03/2026 Reverse object list after load.
// Objects are prepended during creation, which reverses the saved order.
// Version 11+ saves in reverse order so they load in the correct order.
if ( version <= 10 )
{
Object *prev = nullptr;
Expand Down
Loading