Skip to content

bugfix(contain): Abort containee's AIExitState if its container object dies #2513

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

Merged
xezon merged 3 commits into from
May 13, 2026
Merged

bugfix(contain): Abort containee's AIExitState if its container object dies #2513

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb9b2c
fix: Ensure container exists when checking if a specific rider is fre…
Stubbjax Mar 31, 2026
206aaec
bugfix: Abort AIExitState if the containing object dies
Stubbjax May 3, 2026
90b207d
refactor: Convert fix into a standalone block
Stubbjax May 5, 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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6272,7 +6272,12 @@ StateReturnType AIExitState::update()
//GS. The goal of unified ExitInterfaces dies a horrible death. I can't ask Object for the exit,
// as removeFromContain is only in the Contain type. I'm splitting the names in shame.
ExitInterface* goalExitInterface = goal->getContain() ? goal->getContain()->getContainExitInterface() : nullptr;
#if RETAIL_COMPATIBLE_CRC
if( goalExitInterface == nullptr )
#else
// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
if (goalExitInterface == nullptr || goal->isEffectivelyDead())
Comment thread
xezon marked this conversation as resolved.
Outdated
Comment thread
xezon marked this conversation as resolved.
Outdated
#endif
return STATE_FAILURE;

if( goalExitInterface->isExitBusy() )
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6484,7 +6484,12 @@ StateReturnType AIExitState::update()
//GS. The goal of unified ExitInterfaces dies a horrible death. I can't ask Object for the exit,
// as removeFromContain is only in the Contain type. I'm splitting the names in shame.
ExitInterface* goalExitInterface = goal->getContain() ? goal->getContain()->getContainExitInterface() : nullptr;
#if RETAIL_COMPATIBLE_CRC
if( goalExitInterface == nullptr )
#else
// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
if (goalExitInterface == nullptr || goal->isEffectivelyDead())
#endif
return STATE_FAILURE;

if( goalExitInterface->isExitBusy() )
Expand Down
Loading