Skip to content

fix(savegame): Use getFinalOverride in WeaponSet xfer load to match Object constructor #2160

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 4 commits into
base: main
Choose a base branch
from
+10 −0
Open

fix(savegame): Use getFinalOverride in WeaponSet xfer load to match Object constructor #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6be1aa7
bugfix(savegame): Fix weapon timing corruption after load by comparin…
bobtista Jan 20, 2026
dea6222
bugfix(savegame): Fix weapon timing corruption by using getFinalOverr…
bobtista Jan 23, 2026
d9859c7
fix(savegame): Address review feedback - use static_cast and improve …
bobtista Jan 27, 2026
d182d6a
replicate to Generals
bobtista Jan 27, 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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@ void WeaponSet::xfer( Xfer *xfer )
if (tt == nullptr)
throw INI_INVALID_DATA;

// TheSuperHackers @fix bobtista 27/01/2026 findTemplate returns the base template, but Object
// uses getFinalOverride() in its constructor. We must do the same here so m_curWeaponTemplateSet
// points to the same ThingTemplate's weapon sets, avoiding unnecessary reallocation in updateWeaponSet.
tt = static_cast<const ThingTemplate*>(tt->getFinalOverride());

m_curWeaponTemplateSet = tt->findWeaponTemplateSet(wsFlags);
if (m_curWeaponTemplateSet == nullptr)
throw INI_INVALID_DATA;
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ void WeaponSet::xfer( Xfer *xfer )
if (tt == nullptr)
throw INI_INVALID_DATA;

// TheSuperHackers @fix bobtista 27/01/2026 findTemplate returns the base template, but Object
// uses getFinalOverride() in its constructor. We must do the same here so m_curWeaponTemplateSet
// points to the same ThingTemplate's weapon sets, avoiding unnecessary reallocation in updateWeaponSet.
tt = static_cast<const ThingTemplate*>(tt->getFinalOverride());

m_curWeaponTemplateSet = tt->findWeaponTemplateSet(wsFlags);
if (m_curWeaponTemplateSet == nullptr)
throw INI_INVALID_DATA;
Expand Down
Loading