Skip to content

bugfix(behavior): Prevent fallen Angry Mob members from respawning at the Barracks after loading a save #2314

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

Merged
xezon merged 2 commits into from
Feb 21, 2026
Merged

bugfix(behavior): Prevent fallen Angry Mob members from respawning at the Barracks after loading a save #2314

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
23304a3
bugfix: Prevent fallen Angry Mob members respawning at the Barracks a…
Stubbjax Feb 16, 2026
f350626
tweak: Standardise formatting
Stubbjax Feb 21, 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
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,14 +984,19 @@ void SpawnBehavior::crc( Xfer *xfer )
* Version Info:
* 1: Initial version
* 2: Added m_initialBurstTimesInited to the save. jba.
* 3: TheSuperHackers @bugfix Stubbjax 16/02/2026 Added m_initialBurstCountdown.
*/
// ------------------------------------------------------------------------------------------------
void SpawnBehavior::xfer( Xfer *xfer )
{
AsciiString name;

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

Expand All @@ -1003,6 +1008,10 @@ void SpawnBehavior::xfer( Xfer *xfer )
xfer->xferBool(&m_initialBurstTimesInited);
}

if (version >= 3) {
xfer->xferUnsignedInt(&m_initialBurstCountdown);
}

// spawn template
name = m_spawnTemplate ? m_spawnTemplate->getName() : AsciiString::TheEmptyString;
xfer->xferAsciiString( &name );
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,14 +1069,19 @@ void SpawnBehavior::crc( Xfer *xfer )
* Version Info:
* 1: Initial version
* 2: Added m_initialBurstTimesInited to the save. jba.
* 3: TheSuperHackers @bugfix Stubbjax 16/02/2026 Added m_initialBurstCountdown.
*/
// ------------------------------------------------------------------------------------------------
void SpawnBehavior::xfer( Xfer *xfer )
{
AsciiString name;

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

Expand All @@ -1088,6 +1093,10 @@ void SpawnBehavior::xfer( Xfer *xfer )
xfer->xferBool(&m_initialBurstTimesInited);
}

if (version >= 3) {
xfer->xferUnsignedInt(&m_initialBurstCountdown);
}

// spawn template
name = m_spawnTemplate ? m_spawnTemplate->getName() : AsciiString::TheEmptyString;
xfer->xferAsciiString( &name );
Expand Down
Loading