Skip to content

bugfix(dumbprojectile): Fix in-flight DumbProjectile detonating instantly on save load #2591

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 3 commits into from
Apr 15, 2026
Merged

bugfix(dumbprojectile): Fix in-flight DumbProjectile detonating instantly on save load #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bafdd7d
bugfix(save): Fix in-flight DumbProjectile detonating instantly on sa…
afc-afc0 Apr 12, 2026
f60a313
bugfix(save): Add RETAIL_COMPATIBLE_XFER_SAVE guard and fix version c…
afc-afc0 Apr 12, 2026
bae7190
Address PR reviews
afc-afc0 Apr 15, 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
18 changes: 17 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,13 +696,19 @@ void DumbProjectileBehavior::crc( Xfer *xfer )
// ------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version
* 2: TheSuperHackers @bugfix Added m_currentFlightPathStep for mid-flight save/load.
*/
// ------------------------------------------------------------------------------------------------
void DumbProjectileBehavior::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 Down Expand Up @@ -753,6 +759,11 @@ void DumbProjectileBehavior::xfer( Xfer *xfer )
// lifespan frame
xfer->xferUnsignedInt( &m_lifespanFrame );

if( version >= 2 )
{
xfer->xferInt( &m_currentFlightPathStep );
}

}

// ------------------------------------------------------------------------------------------------
Expand All @@ -764,4 +775,9 @@ void DumbProjectileBehavior::loadPostProcess()
// extend base class
UpdateModule::loadPostProcess();

if( m_flightPathSegments > 0 )
{
calcFlightPath( false );
}

}
18 changes: 17 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,13 +747,19 @@ void DumbProjectileBehavior::crc( Xfer *xfer )
// ------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version
* 2: TheSuperHackers @bugfix Added m_currentFlightPathStep for mid-flight save/load.
*/
// ------------------------------------------------------------------------------------------------
void DumbProjectileBehavior::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
XferVersion currentVersion = 1;
#else
XferVersion currentVersion = 2;
Comment thread
afc-afc0 marked this conversation as resolved.
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand Down Expand Up @@ -804,6 +810,11 @@ void DumbProjectileBehavior::xfer( Xfer *xfer )
// lifespan frame
xfer->xferUnsignedInt( &m_lifespanFrame );

if( version >= 2 )
{
xfer->xferInt( &m_currentFlightPathStep );
}

}

// ------------------------------------------------------------------------------------------------
Expand All @@ -815,4 +826,9 @@ void DumbProjectileBehavior::loadPostProcess()
// extend base class
UpdateModule::loadPostProcess();

if( m_flightPathSegments > 0 )
{
calcFlightPath( false );
}

}
Loading