Skip to content

Commit 07b9d0e

Browse files
authored
fix(activebody): Subdual damage can no longer go negative (TheSuperHackers#2184)
1 parent 58e8a2b commit 07b9d0e

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,13 @@ void ActiveBody::internalAddSubdualDamage( Real delta )
12631263
const ActiveBodyModuleData *data = getActiveBodyModuleData();
12641264

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

12691275
//-------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)