bugfix(module): Fix damage calculation for determining the initial death of GLA Battle Bus (#1603)

Stubbjax · web-flow · commit a2cebd814c3e · 2025-09-23T08:54:16.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp
@@ -81,7 +81,12 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo )
 
 	if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE
 			&& !m_isSecondLife
+#if RETAIL_COMPATIBLE_CRC
 			&& damageInfo->in.m_amount >= getHealth()
+#else
+			// TheSuperHackers @bugfix Stubbjax 20/09/2025 Battle Buses now correctly apply damage modifiers when calculating lethal damage
+			&& estimateDamage(damageInfo->in) >= getHealth()
+#endif
 			&& IsHealthDamagingDamage(damageInfo->in.m_damageType)
 			)
 	{

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,12 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo )`
`81`	`81`
`82`	`82`	`if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE`
`83`	`83`	`&& !m_isSecondLife`
	`84`	`+#if RETAIL_COMPATIBLE_CRC`
`84`	`85`	`&& damageInfo->in.m_amount >= getHealth()`
	`86`	`+#else`
	`87`	`+ // TheSuperHackers @bugfix Stubbjax 20/09/2025 Battle Buses now correctly apply damage modifiers when calculating lethal damage`
	`88`	`+ && estimateDamage(damageInfo->in) >= getHealth()`
	`89`	`+#endif`
`85`	`90`	`&& IsHealthDamagingDamage(damageInfo->in.m_damageType)`
`86`	`91`	`)`
`87`	`92`	`{`