File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -492,6 +492,8 @@ void ActiveBody::attemptDamage( DamageInfo *damageInfo )
492492 if ( !canBeSubdued () )
493493 return ;
494494
495+ // TheSuperHackers @bugfix Stubbjax 20/09/2025 The isSubdued() function now directly checks status instead
496+ // of health to prevent indefinite subdue status when internally shifting health across the threshold.
495497 Bool wasSubdued = isSubdued ();
496498 internalAddSubdualDamage (amount);
497499 Bool nowSubdued = m_maxHealth <= m_currentSubdualDamage;
@@ -1316,7 +1318,6 @@ Bool ActiveBody::isSubdued() const
13161318#if RETAIL_COMPATIBLE_CRC
13171319 return m_maxHealth <= m_currentSubdualDamage;
13181320#else
1319- // TheSuperHackers @bugfix Stubbjax 20/09/2025 Prevent indefinite subdue status when internally shifting health across the threshold.
13201321 return getObject ()->isDisabledByType (DISABLED_SUBDUED);
13211322#endif
13221323}
You can’t perform that action at this time.
0 commit comments