Skip to content

bugfix: Prevent building crash damage from dealing damage to other objects #2723

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 3 commits into
base: main
Choose a base branch
from
+42 −0
Open

bugfix: Prevent building crash damage from dealing damage to other objects #2723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99fd606
bugfix: Prevent building crash damage from dealing damage to other ob…
Stubbjax May 17, 2026
a6ffb52
tweak: Add null checks
Stubbjax May 17, 2026
439ebf3
tweak: Assign source player mask
Stubbjax May 17, 2026
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
21 changes: 21 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 @@ -32,8 +32,10 @@
#define NO_DEBUG_CRC

#include "Common/PerfTimer.h"
#include "Common/Player.h"
#include "Common/ThingTemplate.h"
#include "Common/Xfer.h"
#include "GameClient/FXList.h"
#include "GameLogic/GameLogic.h"
#include "GameLogic/Module/AIUpdate.h"
#include "GameLogic/Module/BodyModule.h"
Expand Down Expand Up @@ -1252,7 +1254,26 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
// fall into a building. if a vehicle, blow up. then destroy ourself (not die), regardless.
if (obj->isKindOf(KINDOF_VEHICLE))
{
#if RETAIL_COMPATIBLE_CRC
TheWeaponStore->createAndFireTempWeapon(getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoBuildingWeaponTemplate, obj, obj->getPosition());
#else
// TheSuperHackers @bugfix Stubbjax 17/05/2026 Prevent building collisions from dealing collateral damage to other objects.
const WeaponTemplate* weaponTemplate = getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoBuildingWeaponTemplate;
if (weaponTemplate != nullptr)
Comment thread
xezon marked this conversation as resolved.
{
WeaponBonus nullBonus;

DamageInfo damageInfo;
damageInfo.in.m_damageType = weaponTemplate->getDamageType();
damageInfo.in.m_deathType = weaponTemplate->getDeathType();
damageInfo.in.m_sourceID = obj->getID();
damageInfo.in.m_sourcePlayerMask = obj->getControllingPlayer() ? obj->getControllingPlayer()->getPlayerMask() : 0;
damageInfo.in.m_amount = weaponTemplate->getPrimaryDamage(nullBonus);

other->attemptDamage(&damageInfo);
FXList::doFXObj(weaponTemplate->getFireFX(obj->getVeterancyLevel()), obj);
Comment thread
xezon marked this conversation as resolved.
}
#endif
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.
TheGameLogic->destroyObject(obj);
return;
Expand Down
21 changes: 21 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 @@ -32,8 +32,10 @@
#define NO_DEBUG_CRC

#include "Common/PerfTimer.h"
#include "Common/Player.h"
#include "Common/ThingTemplate.h"
#include "Common/Xfer.h"
#include "GameClient/FXList.h"
#include "GameLogic/GameLogic.h"
#include "GameLogic/Module/AIUpdate.h"
#include "GameLogic/Module/BodyModule.h"
Expand Down Expand Up @@ -1377,7 +1379,26 @@ void PhysicsBehavior::onCollide( Object *other, const Coord3D *loc, const Coord3
// fall into a building. if a vehicle, blow up. then destroy ourself (not die), regardless.
if (obj->isKindOf(KINDOF_VEHICLE))
{
#if RETAIL_COMPATIBLE_CRC
TheWeaponStore->createAndFireTempWeapon(getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoBuildingWeaponTemplate, obj, obj->getPosition());
#else
// TheSuperHackers @bugfix Stubbjax 17/05/2026 Prevent building collisions from dealing collateral damage to other objects.
const WeaponTemplate* weaponTemplate = getPhysicsBehaviorModuleData()->m_vehicleCrashesIntoBuildingWeaponTemplate;
if (weaponTemplate != nullptr)
{
WeaponBonus nullBonus;

DamageInfo damageInfo;
damageInfo.in.m_damageType = weaponTemplate->getDamageType();
damageInfo.in.m_deathType = weaponTemplate->getDeathType();
damageInfo.in.m_sourceID = obj->getID();
damageInfo.in.m_sourcePlayerMask = obj->getControllingPlayer() ? obj->getControllingPlayer()->getPlayerMask() : 0;
damageInfo.in.m_amount = weaponTemplate->getPrimaryDamage(nullBonus);

other->attemptDamage(&damageInfo);
FXList::doFXObj(weaponTemplate->getFireFX(obj->getVeterancyLevel()), obj);
}
#endif
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.
TheGameLogic->destroyObject(obj);
return;
Expand Down
Loading