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 3 commits into
base: main
Choose a base branch
from
+22 −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
3 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
18df0e2
Address review: shorten the comment, and refuse rebuilds only
wh1ter0se69 Aug 10, 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
11 changes: 11 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,17 @@ Bool AIUpdateInterface::chooseLocomotorSetExplicit(LocomotorSetType wst)
const LocomotorTemplateVector* set = getAIUpdateModuleData()->findLocomotorTemplateVector(wst);
if (set)
{
// TheSuperHackers @bugfix wh1ter0se69 10/08/2026 Do not rebuild the locomotor set of a dead
// aircraft. Rebuilding discards the Locomotor instance that a slow death module mutated to
// ground it, so the wreck regains full lift from template and keeps flying.
#if !RETAIL_COMPATIBLE_CRC
Object* obj = getObject();
// LOCOMOTORSET_INVALID means no set has been built yet, so this refuses rebuilds only.
if (obj != nullptr && obj->isEffectivelyDead() && obj->isKindOf(KINDOF_AIRCRAFT)
&& m_curLocomotorSet != LOCOMOTORSET_INVALID)
return FALSE;
#endif

m_locomotorSet.clear();
m_curLocomotor = nullptr;
for (size_t i = 0; i < set->size(); ++i)
Expand Down
11 changes: 11 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,17 @@ Bool AIUpdateInterface::chooseLocomotorSetExplicit(LocomotorSetType wst)
const LocomotorTemplateVector* set = getAIUpdateModuleData()->findLocomotorTemplateVector(wst);
if (set)
{
// TheSuperHackers @bugfix wh1ter0se69 10/08/2026 Do not rebuild the locomotor set of a dead
// aircraft. Rebuilding discards the Locomotor instance that a slow death module mutated to
// ground it, so the wreck regains full lift from template and keeps flying.
#if !RETAIL_COMPATIBLE_CRC
Object* obj = getObject();
// LOCOMOTORSET_INVALID means no set has been built yet, so this refuses rebuilds only.
if (obj != nullptr && obj->isEffectivelyDead() && obj->isKindOf(KINDOF_AIRCRAFT)

@Caball009 Caball009 Aug 13, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

obj->isKindOf(KINDOF_AIRCRAFT)
This looks like a code smell to me, as this is an aircraft specific exception in a generic function.

  1. Please find out where this can be fixed in jet / heli / chinook specific code instead.
  2. You identified that this code:
if (!obj->isEffectivelyDead())
	loco->setMaxLift(BIGNUM);

is used to fight the same bug. I think it deserves a look if the entire issue needs a different kind of fix that doesn't need multiple checks around max lift & locomotor changes.

I included two replays in the issue thread, you can use those to find the best solution. Please refrain from posting LLM generated responses at code reviewers.

&& m_curLocomotorSet != LOCOMOTORSET_INVALID)
return FALSE;
#endif

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