Skip to content

fix(activebody): Subdual damage can no longer go negative #2184

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
Jan 28, 2026
Merged

fix(activebody): Subdual damage can no longer go negative #2184

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f884281
fix: Subdual damage can no longer go negative
Stubbjax Jan 25, 2026
bed4a44
refactor: Streamlined logic
Stubbjax Jan 26, 2026
8d758e4
docs: Update comment
Stubbjax Jan 28, 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
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,13 @@ void ActiveBody::internalAddSubdualDamage( Real delta )
const ActiveBodyModuleData *data = getActiveBodyModuleData();

m_currentSubdualDamage += delta;
#if RETAIL_COMPATIBLE_CRC
m_currentSubdualDamage = min(m_currentSubdualDamage, data->m_subdualDamageCap);
#else
// TheSuperHackers @bugfix Stubbjax 25/01/2026 Subdual damage can no longer go negative, which
// stops weak subdual damage + rapid healing from negatively stacking subdual damage over time.
m_currentSubdualDamage = clamp(0.0f, m_currentSubdualDamage, data->m_subdualDamageCap);
#endif
}

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