Skip to content

bugfix(energy): Don't increase power production for disabled power plants on save game load #2508

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 4 commits into from
Apr 12, 2026
Merged

bugfix(energy): Don't increase power production for disabled power plants on save game load #2508

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
077972c
bugfix(energy): Don't increase power production for disabled power pl…
Caball009 Mar 30, 2026
66a922b
Updated comment.
Caball009 Mar 30, 2026
6089070
Added todo comment.
Caball009 Apr 12, 2026
98dc14d
Replicated in Generals.
Caball009 Apr 12, 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
27 changes: 14 additions & 13 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3638,19 +3638,6 @@ void Object::xfer( Xfer *xfer )
// private status
xfer->xferUnsignedByte( &m_privateStatus );

// OK, now that we have xferred our status bits, it's safe to set the team...
if( xfer->getXferMode() == XFER_LOAD )
{
Team *team = TheTeamFactory->findTeamByID( teamID );
if( team == nullptr )
{
DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
throw SC_INVALID_DATA;
}
const Bool restoring = true;
setOrRestoreTeam( team, restoring );
}

// geometry info
xfer->xferSnapshot( &m_geometryInfo );

Expand Down Expand Up @@ -3693,6 +3680,20 @@ void Object::xfer( Xfer *xfer )
// disabled till frame
xfer->xferUser( m_disabledTillFrame, sizeof( UnsignedInt ) * DISABLED_COUNT );

// OK, now that we have xferred our status bits and disabled data, it's safe to set the team...
// TheSuperHackers @todo Refactor so that this code can be moved to loadPostProcess.
if( xfer->getXferMode() == XFER_LOAD )
{
Team *team = TheTeamFactory->findTeamByID( teamID );
if( team == nullptr )
{
DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
throw SC_INVALID_DATA;
}
const Bool restoring = true;
setOrRestoreTeam( team, restoring );
}

// special model condition until
xfer->xferUnsignedInt( &m_smcUntil );

Expand Down
27 changes: 14 additions & 13 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4160,19 +4160,6 @@ void Object::xfer( Xfer *xfer )
// private status
xfer->xferUnsignedByte( &m_privateStatus );

// OK, now that we have xferred our status bits, it's safe to set the team...
if( xfer->getXferMode() == XFER_LOAD )
{
Team *team = TheTeamFactory->findTeamByID( teamID );
if( team == nullptr )
{
DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
throw SC_INVALID_DATA;
}
const Bool restoring = true;
setOrRestoreTeam( team, restoring );
}

// geometry info
xfer->xferSnapshot( &m_geometryInfo );

Expand Down Expand Up @@ -4224,6 +4211,20 @@ void Object::xfer( Xfer *xfer )
// disabled till frame
xfer->xferUser( m_disabledTillFrame, sizeof( UnsignedInt ) * DISABLED_COUNT );

// OK, now that we have xferred our status bits and disabled data, it's safe to set the team...
// TheSuperHackers @todo Refactor so that this code can be moved to loadPostProcess.
if( xfer->getXferMode() == XFER_LOAD )
{
Team *team = TheTeamFactory->findTeamByID( teamID );
if( team == nullptr )
{
DEBUG_CRASH(( "Object::xfer - Unable to load team" ));
throw SC_INVALID_DATA;
}
const Bool restoring = true;
setOrRestoreTeam( team, restoring );
}

// special model condition until
xfer->xferUnsignedInt( &m_smcUntil );

Expand Down
Loading