Skip to content

bugfix(saveload): Transfer the dock approach position bone count #3151

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 2 commits into
base: main
Choose a base branch
from
Draft

bugfix(saveload): Transfer the dock approach position bone count #3151

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
b553cb2
bugfix(saveload): Transfer the dock approach position bone count
bobtista Aug 14, 2026
c6b3c56
bugfix(saveload): Transfer the dock approach position bone count (Gen…
bobtista Aug 14, 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
16 changes: 15 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,13 +543,21 @@ void DockUpdate::crc( Xfer *xfer )
}

// ------------------------------------------------------------------------------------------------
/** Xfer Method */
/** Xfer Method
* Version Info:
* 1: Initial version
* 2: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize the approach position bone count, so
* a dock with no waiting bones keeps biasing approach positions toward the caller on load */
// ------------------------------------------------------------------------------------------------
void DockUpdate::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
XferVersion currentVersion = 1;
#else
XferVersion currentVersion = 2;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -568,6 +576,12 @@ void DockUpdate::xfer( Xfer *xfer )
// # approach positions
xfer->xferInt( &m_numberApproachPositions );

// # approach position bones
if( version >= 2 )
{
xfer->xferInt( &m_numberApproachPositionBones );
}

// positions loaded
xfer->xferBool( &m_positionsLoaded );

Expand Down
16 changes: 15 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/DockUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,21 @@ void DockUpdate::crc( Xfer *xfer )
}

// ------------------------------------------------------------------------------------------------
/** Xfer Method */
/** Xfer Method
* Version Info:
* 1: Initial version
* 2: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize the approach position bone count, so
* a dock with no waiting bones keeps biasing approach positions toward the caller on load */
// ------------------------------------------------------------------------------------------------
void DockUpdate::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
XferVersion currentVersion = 1;
#else
XferVersion currentVersion = 2;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -583,6 +591,12 @@ void DockUpdate::xfer( Xfer *xfer )
// # approach positions
xfer->xferInt( &m_numberApproachPositions );

// # approach position bones
if( version >= 2 )
{
xfer->xferInt( &m_numberApproachPositionBones );
}

// positions loaded
xfer->xferBool( &m_positionsLoaded );

Expand Down
Loading