Skip to content

bugfix(saveload): Transfer the weapon set pitch limit flag #3145

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 weapon set pitch limit flag #3145

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
f550590
bugfix(saveload): Transfer the weapon set pitch limit flag
bobtista Aug 14, 2026
551a841
bugfix(saveload): Transfer the weapon set pitch limit flag (Generals)
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
13 changes: 11 additions & 2 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 @@ -200,6 +200,8 @@ void WeaponSet::crc( Xfer *xfer )
* 1: Initial version
* 2: TheSuperHackers @tweak Upgrade damage type flags from integer to BitFlags for Generals.
* Zero Hour already had this at version 1.
* 3: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize m_hasPitchLimit in the slot that
* repeated m_hasDamageWeapon, so a pitch limited weapon set keeps its limit on load
*/
// ------------------------------------------------------------------------------------------------
void WeaponSet::xfer( Xfer *xfer )
Expand All @@ -208,7 +210,7 @@ void WeaponSet::xfer( Xfer *xfer )
#if RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 1;
#else
const XferVersion currentVersion = 2;
const XferVersion currentVersion = 3;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );
Expand Down Expand Up @@ -285,7 +287,14 @@ void WeaponSet::xfer( Xfer *xfer )
}
#endif

xfer->xferBool(&m_hasDamageWeapon);
if (version >= 3)
{
xfer->xferBool(&m_hasPitchLimit);
}
else
{
xfer->xferBool(&m_hasDamageWeapon);
}
xfer->xferBool(&m_hasDamageWeapon);

#if RTS_GENERALS
Expand Down
13 changes: 11 additions & 2 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 @@ -208,6 +208,8 @@ void WeaponSet::crc( Xfer *xfer )
* 1: Initial version
* 2: TheSuperHackers @tweak Upgrade damage type flags from integer to BitFlags for Generals.
* Zero Hour already had this at version 1.
* 3: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize m_hasPitchLimit in the slot that
* repeated m_hasDamageWeapon, so a pitch limited weapon set keeps its limit on load
*/
// ------------------------------------------------------------------------------------------------
void WeaponSet::xfer( Xfer *xfer )
Expand All @@ -216,7 +218,7 @@ void WeaponSet::xfer( Xfer *xfer )
#if RETAIL_COMPATIBLE_XFER_SAVE
const XferVersion currentVersion = 1;
#else
const XferVersion currentVersion = 2;
const XferVersion currentVersion = 3;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );
Expand Down Expand Up @@ -293,7 +295,14 @@ void WeaponSet::xfer( Xfer *xfer )
}
#endif

xfer->xferBool(&m_hasDamageWeapon);
if (version >= 3)
{
xfer->xferBool(&m_hasPitchLimit);
}
else
{
xfer->xferBool(&m_hasDamageWeapon);
}
xfer->xferBool(&m_hasDamageWeapon);

#if RTS_GENERALS
Expand Down
Loading