Skip to content

bugfix: Chinooks and Helixes no longer take off after repair if passengers want to board or exit #1787

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

bugfix: Chinooks and Helixes no longer take off after repair if passengers want to board or exit #1787

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
8 changes: 6 additions & 2 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 @@ -1002,9 +1002,15 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
UpdateSleepTime ChinookAIUpdate::update()
{
ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
ContainModuleInterface* contain = getObject()->getContain();
Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();

if (pp != NULL)
{
if (m_flightStatus == CHINOOK_LANDED &&
#if !RETAIL_COMPATIBLE_CRC
!waitingToEnterOrExit &&
#endif
!m_hasPendingCommand &&
getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
{
Expand All @@ -1026,10 +1032,8 @@ UpdateSleepTime ChinookAIUpdate::update()
// when we have a pending command...
if (SupplyTruckAIUpdate::isIdle())
{
ContainModuleInterface* contain = getObject()->getContain();
if( contain )
{
Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
if (m_hasPendingCommand)
{
AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI); // values don't matter, will be wiped by next line
Expand Down
8 changes: 6 additions & 2 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 @@ -1064,9 +1064,15 @@ Bool ChinookAIUpdate::chooseLocomotorSet(LocomotorSetType wst)
UpdateSleepTime ChinookAIUpdate::update()
{
ParkingPlaceBehaviorInterface* pp = getPP(m_airfieldForHealing);
ContainModuleInterface* contain = getObject()->getContain();
Bool waitingToEnterOrExit = contain && contain->hasObjectsWantingToEnterOrExit();

if (pp != NULL)
{
if (m_flightStatus == CHINOOK_LANDED &&
#if !RETAIL_COMPATIBLE_CRC
!waitingToEnterOrExit &&
#endif
!m_hasPendingCommand &&
getObject()->getBodyModule()->getHealth() == getObject()->getBodyModule()->getMaxHealth())
{
Expand All @@ -1088,12 +1094,10 @@ UpdateSleepTime ChinookAIUpdate::update()

// have to call our parent's isIdle, because we override it to never return true
// when we have a pending command...
ContainModuleInterface* contain = getObject()->getContain();
if( contain )
{
if (SupplyTruckAIUpdate::isIdle())
{
Bool waitingToEnterOrExit = contain->hasObjectsWantingToEnterOrExit();
if (m_hasPendingCommand)
{
AICommandParms parms(AICMD_MOVE_TO_POSITION, CMD_FROM_AI); // values don't matter, will be wiped by next line
Expand Down
Loading