Skip to content

bugfix(module): GLA Battle Bus can no longer be subdued indefinitely #1604

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
merged 4 commits into from
Sep 25, 2025
Merged

bugfix(module): GLA Battle Bus can no longer be subdued indefinitely #1604

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9a99ba
bugfix: Battle Bus can no longer be subdued indefinitely
Stubbjax Sep 19, 2025
9c16290
bugfix: Apply fix for all cases of max health changes
Stubbjax Sep 20, 2025
25c541d
tweak: Cleaner solution
Stubbjax Sep 24, 2025
61197eb
docs: Update comment
Stubbjax Sep 24, 2025
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
8 changes: 7 additions & 1 deletion 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 @@ -492,9 +492,11 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
if( !canBeSubdued() )
return;

// TheSuperHackers @bugfix Stubbjax 20/09/2025 The isSubdued() function now directly checks status instead
// of health to prevent indefinite subdue status when internally shifting health across the threshold.
Bool wasSubdued = isSubdued();
internalAddSubdualDamage(amount);
Bool nowSubdued = isSubdued();
Bool nowSubdued = m_maxHealth <= m_currentSubdualDamage;
alreadyHandled = TRUE;
allowModifier = FALSE;

Expand Down Expand Up @@ -1313,7 +1315,11 @@ void ActiveBody::onSubdualChange( Bool isNowSubdued )
//-------------------------------------------------------------------------------------------------
Bool ActiveBody::isSubdued() const
{
#if RETAIL_COMPATIBLE_CRC
return m_maxHealth <= m_currentSubdualDamage;
#else
return getObject()->isDisabledByType(DISABLED_SUBDUED);
#endif
}

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