Skip to content

bugfix: Repairing Chinooks and Helixes no longer take off after evacuating all passengers #1762

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
Stubbjax wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix: Repairing Chinooks and Helixes no longer take off after evacuating all passengers #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions 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 @@ -1123,8 +1123,14 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
//-------------------------------------------------------------------------------------------------
void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
{
#if RETAIL_COMPATIBLE_CRC
// this gets reset every time a command is issued.
setAirfieldForHealing(INVALID_ID);
#else
// Don't leave healing state for evacuation commands
Copy link

@xezon xezon Dec 3, 2025

Choose a reason for hiding this comment

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

TheSuperHackers @bugfix

if (parms->m_cmd != AICMD_EVACUATE && parms->m_cmd != AICMD_EXIT)
setAirfieldForHealing(INVALID_ID);
Copy link

@xezon xezon Dec 3, 2025

Choose a reason for hiding this comment

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

It may be better to combine this call with the switch case down below instead. Or is there a reason we cannot do that? The passItThru thing below is also weird.

#endif

if (!isAllowedToRespondToAiCommands(parms))
return;
Expand Down
6 changes: 6 additions & 0 deletions 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 @@ -1258,8 +1258,14 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
//-------------------------------------------------------------------------------------------------
void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
{
#if RETAIL_COMPATIBLE_CRC
// this gets reset every time a command is issued.
setAirfieldForHealing(INVALID_ID);
#else
// Don't leave healing state for evacuation commands
if (parms->m_cmd != AICMD_EVACUATE && parms->m_cmd != AICMD_EXIT)
setAirfieldForHealing(INVALID_ID);
#endif

if (!isAllowedToRespondToAiCommands(parms))
return;
Expand Down
Loading