File tree Expand file tree Collapse file tree
GeneralsMD/Code/GameEngine/Source/GameLogic/AI
Generals/Code/GameEngine/Source/GameLogic/AI Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -6272,13 +6272,14 @@ StateReturnType AIExitState::update()
62726272 // GS. The goal of unified ExitInterfaces dies a horrible death. I can't ask Object for the exit,
62736273 // as removeFromContain is only in the Contain type. I'm splitting the names in shame.
62746274 ExitInterface* goalExitInterface = goal->getContain () ? goal->getContain ()->getContainExitInterface () : nullptr ;
6275- #if RETAIL_COMPATIBLE_CRC
62766275 if ( goalExitInterface == nullptr )
6277- #else
6276+ return STATE_FAILURE;
6277+
6278+ #if !RETAIL_COMPATIBLE_CRC
62786279 // TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
6279- if (goalExitInterface == nullptr || goal->isEffectivelyDead ())
6280- #endif
6280+ if (goal->isEffectivelyDead ())
62816281 return STATE_FAILURE;
6282+ #endif
62826283
62836284 if ( goalExitInterface->isExitBusy () )
62846285 return STATE_CONTINUE;// Just wait a sec.
Original file line number Diff line number Diff line change @@ -6484,13 +6484,14 @@ StateReturnType AIExitState::update()
64846484 // GS. The goal of unified ExitInterfaces dies a horrible death. I can't ask Object for the exit,
64856485 // as removeFromContain is only in the Contain type. I'm splitting the names in shame.
64866486 ExitInterface* goalExitInterface = goal->getContain () ? goal->getContain ()->getContainExitInterface () : nullptr ;
6487- #if RETAIL_COMPATIBLE_CRC
64886487 if ( goalExitInterface == nullptr )
6489- #else
6488+ return STATE_FAILURE;
6489+
6490+ #if !RETAIL_COMPATIBLE_CRC
64906491 // TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
6491- if (goalExitInterface == nullptr || goal->isEffectivelyDead ())
6492- #endif
6492+ if (goal->isEffectivelyDead ())
64936493 return STATE_FAILURE;
6494+ #endif
64946495
64956496 if ( goalExitInterface->isExitBusy () )
64966497 return STATE_CONTINUE;// Just wait a sec.
You can’t perform that action at this time.
0 commit comments