Skip to content

bugfix(ai): Do not rebuild the locomotor set of a dead aircraft #3072

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
wh1ter0se69 wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −0
Open

bugfix(ai): Do not rebuild the locomotor set of a dead aircraft #3072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcdc5e3
bugfix(ai): Do not rebuild the locomotor set of a dead aircraft
wh1ter0se69 Aug 7, 2026
117104e
Guard the fix behind RETAIL_COMPATIBLE_CRC
wh1ter0se69 Aug 7, 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
19 changes: 19 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,25 @@ Bool AIUpdateInterface::chooseLocomotorSetExplicit(LocomotorSetType wst)
const LocomotorTemplateVector* set = getAIUpdateModuleData()->findLocomotorTemplateVector(wst);
if (set)
{
// TheSuperHackers @bugfix Do not rebuild the locomotor set of a dead aircraft.
//
// A slow death module disables flight by mutating the CURRENT Locomotor instance -
// JetSlowDeathBehavior::beginSlowDeath() applies a negative maxLift and a zero
// maxTurnRate to getCurLocomotor(). Rebuilding the set here deleteInstance()s that
// Locomotor and constructs replacements from template, and the Locomotor constructor
// resets m_maxLift and m_maxTurnRate to BIGNUM. The wreck therefore regains full lift
// and full turn rate and keeps flying, circling forever because DestructionDelay is
// effectively infinite.
//
// This lives in AIUpdateInterface rather than in a slow death module because every
// aircraft reaches it, which is why the symptom is reported for jets and helicopters
// alike.
#if !RETAIL_COMPATIBLE_CRC
Object* obj = getObject();
if (obj != nullptr && obj->isEffectivelyDead() && obj->isKindOf(KINDOF_AIRCRAFT))
return FALSE;
#endif

m_locomotorSet.clear();
m_curLocomotor = nullptr;
for (size_t i = 0; i < set->size(); ++i)
Expand Down
19 changes: 19 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,25 @@ Bool AIUpdateInterface::chooseLocomotorSetExplicit(LocomotorSetType wst)
const LocomotorTemplateVector* set = getAIUpdateModuleData()->findLocomotorTemplateVector(wst);
if (set)
{
// TheSuperHackers @bugfix Do not rebuild the locomotor set of a dead aircraft.
//
// A slow death module disables flight by mutating the CURRENT Locomotor instance -
// JetSlowDeathBehavior::beginSlowDeath() applies a negative maxLift and a zero
// maxTurnRate to getCurLocomotor(). Rebuilding the set here deleteInstance()s that
// Locomotor and constructs replacements from template, and the Locomotor constructor
// resets m_maxLift and m_maxTurnRate to BIGNUM. The wreck therefore regains full lift
// and full turn rate and keeps flying, circling forever because DestructionDelay is
// effectively infinite.
//
// This lives in AIUpdateInterface rather than in a slow death module because every
// aircraft reaches it, which is why the symptom is reported for jets and helicopters
// alike.
#if !RETAIL_COMPATIBLE_CRC
Object* obj = getObject();
if (obj != nullptr && obj->isEffectivelyDead() && obj->isKindOf(KINDOF_AIRCRAFT))
return FALSE;
#endif

m_locomotorSet.clear();
m_curLocomotor = nullptr;
for (size_t i = 0; i < set->size(); ++i)
Expand Down