Skip to content

bugfix(saveload): Restore dock approach bone count after loading #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

Open
bobtista wants to merge 12 commits into
base: main
Choose a base branch
from
+22 −4
Open

bugfix(saveload): Restore dock approach bone count after loading #3151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d864e62
bugfix(saveload): Transfer the dock approach position bone count
bobtista Aug 14, 2026
5d919e8
bugfix(saveload): Transfer the dock approach position bone count (Gen…
bobtista Aug 14, 2026
beaa5b3
docs(saveload): Move dock counter explanation beside transfer
bobtista Sep 24, 2026
d802721
docs(saveload): Move dock counter explanation beside transfer in Gene…
bobtista Sep 24, 2026
e062b86
docs(saveload): Remove the redundant dock bone label
bobtista Sep 24, 2026
4d1d84b
docs(generals): Align existing PR comments with Zero Hour
bobtista Sep 24, 2026
35fa61b
style(dock): Keep the bone count label inside the version branch
bobtista Sep 25, 2026
bf43c4d
style(dock): Keep the bone count label inside the version branch in G…
bobtista Sep 25, 2026
f87f879
bugfix(dock): Recompute dock positions after loading
bobtista Sep 30, 2026
ef3b52b
bugfix(generals): Recompute dock positions after loading
bobtista Sep 30, 2026
fe4f181
docs(dock): Explain approach bone count reconstruction
bobtista Sep 30, 2026
f3d7502
docs(generals): Explain approach bone count reconstruction
bobtista Sep 30, 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
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
Coord3D m_dockPosition;
Coord3D m_exitPosition;
Int m_numberApproachPositions;
Int m_numberApproachPositionBones;
Int m_numberApproachPositionBones; ///< Recomputed after loading; does not need serialization.

// These are real variables local to my specific needs here in DockUpdate
Bool m_positionsLoaded; ///< FALSE until we have loaded all the docking positions
Expand Down
11 changes: 10 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,7 +543,10 @@ void DockUpdate::crc( Xfer *xfer )
}

// ------------------------------------------------------------------------------------------------
/** Xfer Method */
/** Xfer Method
* Version Info:
* 1: Initial version
*/
// ------------------------------------------------------------------------------------------------
void DockUpdate::xfer( Xfer *xfer )
{
Expand Down Expand Up @@ -627,5 +630,11 @@ void DockUpdate::loadPostProcess()
// call base class
UpdateModule::loadPostProcess();

// TheSuperHackers @bugfix bobtista 30/09/2026 Restore the unsaved approach bone count.
if( m_positionsLoaded )
{
loadDockPositions();
}

}

2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface
Coord3D m_dockPosition;
Coord3D m_exitPosition;
Int m_numberApproachPositions;
Int m_numberApproachPositionBones;
Int m_numberApproachPositionBones; ///< Recomputed after loading; does not need serialization.

// These are real variables local to my specific needs here in DockUpdate
Bool m_positionsLoaded; ///< FALSE until we have loaded all the docking positions
Expand Down
11 changes: 10 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,7 +558,10 @@ void DockUpdate::crc( Xfer *xfer )
}

// ------------------------------------------------------------------------------------------------
/** Xfer Method */
/** Xfer Method
* Version Info:
* 1: Initial version
*/
// ------------------------------------------------------------------------------------------------
void DockUpdate::xfer( Xfer *xfer )
{
Expand Down Expand Up @@ -642,5 +645,11 @@ void DockUpdate::loadPostProcess()
// call base class
UpdateModule::loadPostProcess();

// TheSuperHackers @bugfix bobtista 30/09/2026 Restore the unsaved approach bone count.
if( m_positionsLoaded )
{
loadDockPositions();
}

}

Loading