Skip to content

bugfix: Prevent dead units from repeatedly dealing crash damage on collision with non-buildings #2204

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

Open
Stubbjax wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Open

bugfix: Prevent dead units from repeatedly dealing crash damage on collision with non-buildings #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Generals/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,12 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
else
{
// fall into a nonbuilding -- whatever. if we're a vehicle, quietly do a little damage.
#if RETAIL_COMPATIBLE_CRC
if (obj->isKindOf(KINDOF_VEHICLE))
#else
// TheSuperHackers @bugfix Stubbjax 28/01/2026 Prevent dead units from repeatedly dealing damage.
if (obj->isKindOf(KINDOF_VEHICLE) && !obj->isEffectivelyDead())
#endif
{
TheWeaponStore->createAndFireTempWeapon(getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoNonBuildingWeaponTemplate, obj, obj->getPosition());
}
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,12 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
else
{
// fall into a nonbuilding -- whatever. if we're a vehicle, quietly do a little damage.
#if RETAIL_COMPATIBLE_CRC
if (obj->isKindOf(KINDOF_VEHICLE))
#else
// TheSuperHackers @bugfix Stubbjax 28/01/2026 Prevent dead units from repeatedly dealing damage.
if (obj->isKindOf(KINDOF_VEHICLE) && !obj->isEffectivelyDead())
#endif
{
TheWeaponStore->createAndFireTempWeapon(getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoNonBuildingWeaponTemplate, obj, obj->getPosition());
}
Expand Down
Loading