Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d16e35f
bugfix: Battle Bus now correctly applies damage modifiers when determ…
Stubbjax Sep 19, 2025
835c925
docs: Add comment
Stubbjax Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/UndeadBody.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ void UndeadBody::attemptDamage( DamageInfo *damageInfo )

if( damageInfo->in.m_damageType != DAMAGE_UNRESISTABLE
&& !m_isSecondLife
#if RETAIL_COMPATIBLE_CRC
Copy link

@xezon xezon Sep 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think better use RETAIL_COMPATIBLE_BUG here

Copy link
Author

@Stubbjax Stubbjax Sep 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in this is a desirable bug to be kept? If some players strangely desire this behaviour, they can surely just tweak the Battle Bus's HAZARD_CLEANUP damage modifier to deal damage.

Armor BattleBusTruckArmor
+  Armor = HAZARD_CLEANUP      50%    ;Now consistently harmed by cleaning weapons
-  Armor = HAZARD_CLEANUP       0%    ;Not harmed by cleaning weapons
End

Copy link

@xezon xezon Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

&& 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)
)
{
Expand Down
Loading