Skip to content

bugfix(aiupdate): Chinooks and Helixes now correctly wait for their passengers to disembark #1792

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
Jan 22, 2026
Merged

bugfix(aiupdate): Chinooks and Helixes now correctly wait for their passengers to disembark #1792

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
efcf500
bugfix: Chinooks and Helixes now correctly wait for their passengers …
Stubbjax Nov 4, 2025
2869b7f
docs: Add comments
Stubbjax Jan 22, 2026
360c372
refactor: Streamline logic
Stubbjax Jan 22, 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
10 changes: 9 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,6 +1156,14 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
{
const Real THRESH = 3.0f;
const Real THRESH_SQR = THRESH*THRESH;
#if RETAIL_COMPATIBLE_CRC
const bool allowExit = true;
#else
// TheSuperHackers @bugfix Stubbjax 04/11/2025 Passengers are no longer all dumped in a single frame.
const ContainModuleInterface* contain = getObject()->getContain();
const bool allowExit = contain && contain->hasObjectsWantingToEnterOrExit();
#endif

if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR &&
m_flightStatus == CHINOOK_LANDED)
{
Expand All @@ -1166,7 +1174,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);
passItThru = false;
}
else
else if (allowExit)
{
// do this INSTEAD of the standard stuff
setMyState(
Expand Down
10 changes: 9 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,14 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
{
const Real THRESH = 3.0f;
const Real THRESH_SQR = THRESH*THRESH;
#if RETAIL_COMPATIBLE_CRC
const bool allowExit = true;
#else
// TheSuperHackers @bugfix Stubbjax 04/11/2025 Passengers are no longer all dumped in a single frame.
const ContainModuleInterface* contain = getObject()->getContain();
const bool allowExit = contain && contain->hasObjectsWantingToEnterOrExit();
#endif

if (calcDistSqr(*getObject()->getPosition(), parms->m_pos) > THRESH_SQR &&
m_flightStatus == CHINOOK_LANDED)
{
Expand All @@ -1301,7 +1309,7 @@ void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
setMyState(TAKING_OFF, NULL, NULL, CMD_FROM_AI);
passItThru = false;
}
else
else if (allowExit)
{
// do this INSTEAD of the standard stuff
setMyState(
Expand Down
Loading