Skip to content

Commit 59482a6

Browse files
authored
bugfix(module): A projectile can no longer be jammed multiple times (#1907)
1 parent b68c0b9 commit 59482a6

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,11 @@ Bool ActiveBody::isSubdued() const
13231323
#if RETAIL_COMPATIBLE_CRC
13241324
return m_maxHealth <= m_currentSubdualDamage;
13251325
#else
1326+
// TheSuperHackers @info Projectiles don't receive the DISABLED_SUBDUED flag (or any flag for
1327+
// that matter) when jammed, so we have to check their subdual damage directly.
1328+
if (getObject()->isKindOf(KINDOF_PROJECTILE))
1329+
return m_maxHealth <= m_currentSubdualDamage;
1330+
13261331
return getObject()->isDisabledByType(DISABLED_SUBDUED);
13271332
#endif
13281333
}

0 commit comments

Comments
 (0)