From d16e35f612c49f1fe25f22d1d61859251fd810b0 Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Sat, 20 Sep 2025 00:56:09 +1000 Subject: [PATCH 1/2] bugfix: Battle Bus now correctly applies damage modifiers when determining initial death --- .../GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp index 05b968d322..9c96e9497e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp @@ -81,7 +81,11 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo ) if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE && !m_isSecondLife +#if RETAIL_COMPATIBLE_CRC && damageInfo->in.m_amount >= getHealth() +#else + && estimateDamage(damageInfo->in) >= getHealth() +#endif && IsHealthDamagingDamage(damageInfo->in.m_damageType) ) { From 835c9255ddd1f57ba17d094c8f18d4197a4a7189 Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Sat, 20 Sep 2025 21:01:17 +1000 Subject: [PATCH 2/2] docs: Add comment --- .../Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp index 9c96e9497e..c66ae7f586 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp @@ -84,6 +84,7 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo ) #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)