Skip to content

bugfix(weapon): Fix missing Aurora Alpha second explosion on structures #3057

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
Okladnoj wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −0
Open

bugfix(weapon): Fix missing Aurora Alpha second explosion on structures #3057

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
4 changes: 4 additions & 0 deletions Core/GameEngine/Include/Common/GameDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
#define PRESERVE_NO_XP_FROM_OCL_KILLS (1)
#endif

#ifndef PRESERVE_MISSING_AURORA_SECOND_EXPLOSION
#define PRESERVE_MISSING_AURORA_SECOND_EXPLOSION (0)
#endif

#ifndef PRESERVE_NO_XP_FROM_POISON_KILLS
#define PRESERVE_NO_XP_FROM_POISON_KILLS (1)
#endif
Expand Down
16 changes: 16 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
#include "PreRTS.h" // This must go first in EVERY cpp file in the GameEngine

#include <string.h>

#define DEFINE_DEATH_NAMES
#define DEFINE_WEAPONBONUSCONDITION_NAMES
#define DEFINE_WEAPONBONUSFIELD_NAMES
Expand Down Expand Up @@ -1672,6 +1674,20 @@ WeaponTemplate *WeaponStore::newWeaponTemplate(AsciiString name)
WeaponTemplate *wt = newInstance(WeaponTemplate);
wt->m_name = name;
wt->m_nameKey = TheNameKeyGenerator->nameToKey( name );

#if !RETAIL_COMPATIBLE_CRC && !PRESERVE_MISSING_AURORA_SECOND_EXPLOSION
// TheSuperHackers @bugfix Okladnoj 03/08/2026 SupW_AuroraFuelBombWeapon does not specify
// MissileCallsOnDie in INI, so getDieOnDetonate() returns false and MissileAIUpdate::detonate()
// skips the attemptDamage() call that runs the die modules of the projectile. The second explosion
// then never happens when the target is a structure. The fix belongs in the game data
// (MissileCallsOnDie = Yes), which does not live in this repository, so force the flag here.
if (strcmp(name.str(), "SupW_AuroraFuelBombWeapon") == 0)
{
wt->m_dieOnDetonate = TRUE;
DEBUG_LOG(("WeaponStore::newWeaponTemplate() - forcing MissileCallsOnDie for %s", name.str()));
}
#endif

m_weaponTemplateVector.push_back(wt);
m_weaponTemplateHashMap[wt->m_nameKey] = wt;

Expand Down
Loading