Skip to content

bugfix(saveload): Transfer the assault transport new member flags #3148

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
+32 −2
Draft

bugfix(saveload): Transfer the assault transport new member flags #3148

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
42d0bd3
bugfix(saveload): Transfer the assault transport new member flags
bobtista Aug 14, 2026
ed78b13
bugfix(saveload): Transfer the assault transport new member flags (Ge…
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
17 changes: 16 additions & 1 deletion ...rals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,18 @@ void AssaultTransportAIUpdate::crc( Xfer *xfer )
//-------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version
* 2: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize the new member flags, so members
* that boarded after the attack order are not ordered out of the transport on load */
//-------------------------------------------------------------------------------------------------
void AssaultTransportAIUpdate::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 All @@ -508,6 +514,10 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
{
xfer->xferObjectID( &(m_memberIDs[ i ]) );
xfer->xferBool( &(m_memberHealing[ i ]) );
if( version >= 2 )
{
xfer->xferBool( &(m_newMember[ i ]) );
}
}

xfer->xferCoord3D( &m_attackMoveGoalPos );
Expand All @@ -521,6 +531,11 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
xfer->xferBool( &m_isAttackMove );
xfer->xferBool( &m_isAttackObject );

if( version >= 2 )
{
xfer->xferBool( &m_newOccupantsAreNewMembers );
}

}

//-------------------------------------------------------------------------------------------------
Expand Down
17 changes: 16 additions & 1 deletion ...lsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,18 @@ void AssaultTransportAIUpdate::crc( Xfer *xfer )
//-------------------------------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version */
* 1: Initial version
* 2: TheSuperHackers @bugfix bobtista 14/08/2026 Serialize the new member flags, so members
* that boarded after the attack order are not ordered out of the transport on load */
//-------------------------------------------------------------------------------------------------
void AssaultTransportAIUpdate::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 All @@ -510,6 +516,10 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
{
xfer->xferObjectID( &(m_memberIDs[ i ]) );
xfer->xferBool( &(m_memberHealing[ i ]) );
if( version >= 2 )
{
xfer->xferBool( &(m_newMember[ i ]) );
}
}

xfer->xferCoord3D( &m_attackMoveGoalPos );
Expand All @@ -523,6 +533,11 @@ void AssaultTransportAIUpdate::xfer( Xfer *xfer )
xfer->xferBool( &m_isAttackMove );
xfer->xferBool( &m_isAttackObject );

if( version >= 2 )
{
xfer->xferBool( &m_newOccupantsAreNewMembers );
}

}

//-------------------------------------------------------------------------------------------------
Expand Down
Loading