Skip to content

bugfix(saveload): Keep the dark low power appearance on disabled objects when saving #3127

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
+34 −4
Draft

bugfix(saveload): Keep the dark low power appearance on disabled objects when saving #3127

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
9dbf23c
bugfix(saveload): Keep the dark low power appearance on disabled obje…
bobtista Aug 13, 2026
0cdaa42
bugfix(saveload): Keep the dark low power appearance on disabled obje…
bobtista Aug 13, 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
19 changes: 17 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4895,9 +4895,24 @@ void TintEnvelope::xfer( Xfer *xfer )
// sustain counter
if (version <= 1)
{
UnsignedInt sustainCounter = (UnsignedInt)m_sustainCounter;
// TheSuperHackers @bugfix bobtista 13/08/2026 Preserve the indefinite sustain sentinel across the retail
// compatible save format. (Real)SUSTAIN_INDEFINITELY rounds up to 4294967296, which is out of range for
// UnsignedInt, so converting it back is undefined and yields 0 on MSVC. Assigning that result back also
// cleared the sustain on save, which released color envelopes that are meant to hold indefinitely.
UnsignedInt sustainCounter;
if( m_sustainCounter >= (Real)SUSTAIN_INDEFINITELY )
{
sustainCounter = SUSTAIN_INDEFINITELY;
}
else
{
sustainCounter = (UnsignedInt)m_sustainCounter;
}
xfer->xferUnsignedInt( &sustainCounter );
m_sustainCounter = (Real)sustainCounter;
if( xfer->getXferMode() == XFER_LOAD )
{
m_sustainCounter = (Real)sustainCounter;
}
}
else
{
Expand Down
19 changes: 17 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5614,9 +5614,24 @@ void TintEnvelope::xfer( Xfer *xfer )
// sustain counter
if (version <= 1)
{
UnsignedInt sustainCounter = (UnsignedInt)m_sustainCounter;
// TheSuperHackers @bugfix bobtista 13/08/2026 Preserve the indefinite sustain sentinel across the retail
// compatible save format. (Real)SUSTAIN_INDEFINITELY rounds up to 4294967296, which is out of range for
// UnsignedInt, so converting it back is undefined and yields 0 on MSVC. Assigning that result back also
// cleared the sustain on save, which released color envelopes that are meant to hold indefinitely.
UnsignedInt sustainCounter;
if( m_sustainCounter >= (Real)SUSTAIN_INDEFINITELY )
{
sustainCounter = SUSTAIN_INDEFINITELY;
}
else
{
sustainCounter = (UnsignedInt)m_sustainCounter;
}
xfer->xferUnsignedInt( &sustainCounter );
m_sustainCounter = (Real)sustainCounter;
if( xfer->getXferMode() == XFER_LOAD )
{
m_sustainCounter = (Real)sustainCounter;
}
}
else
{
Expand Down
Loading