From efcf500a13314c3021ab8ccb4b9542999099ee94 Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Tue, 4 Nov 2025 15:09:14 +1100 Subject: [PATCH] bugfix: Chinooks and Helixes now correctly wait for their passengers to disembark --- .../GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp | 4 ++++ .../GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp index 7c13cab791..7384dba604 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp @@ -1166,7 +1166,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms) setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI); passItThru = false; } +#if RETAIL_COMPATIBLE_CRC else +#else + else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit()) +#endif { // do this INSTEAD of the standard stuff setMyState( diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp index c6fca75821..b1da0d9f89 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp @@ -1301,7 +1301,11 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms) setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI); passItThru = false; } +#if RETAIL_COMPATIBLE_CRC else +#else + else if (getObject()->getContain() && getObject()->getContain()->hasObjectsWantingToEnterOrExit()) +#endif { // do this INSTEAD of the standard stuff setMyState(