Skip to content

bugfix: Fix aircraft falling to their death if their Airfield is lost during their return flight #3076

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 4 commits into
base: main
Choose a base branch
from
+30 −14
Open

bugfix: Fix aircraft falling to their death if their Airfield is lost during their return flight #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4587636
bugfix: Fix aircraft falling to their death if their Airfield is lost…
Stubbjax Jun 4, 2025
1ac2404
bugfix: More optimal solution
Stubbjax Sep 15, 2025
718ebc4
chore: Apply retail-compatible branching
Stubbjax Aug 8, 2026
593ca1e
tweak: Adjust helicopter logic in a separate change
Stubbjax Aug 8, 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
22 changes: 15 additions & 7 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,11 @@ class JetAwaitingRunwayState : public State

ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
{
// no producer? just skip this step.
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
}
#else
return STATE_FAILURE;
#endif

// gotta reserve a space in order to reserve a runway
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), nullptr))
Expand Down Expand Up @@ -446,10 +447,13 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
jetAI->chooseLocomotorSet(LOCOMOTORSET_TAXIING);
DEBUG_ASSERTCRASH(jetAI->getCurLocomotor(), ("no loco"));

Object* airfield;
ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
return STATE_SUCCESS; // no airfield? just skip this step.
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
#else
return STATE_FAILURE;
#endif

ParkingPlaceBehaviorInterface::PPInfo ppinfo;
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
Expand Down Expand Up @@ -585,7 +589,11 @@ class JetTakeoffOrLandingState : public AIFollowPathState

ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
return STATE_SUCCESS; // no airfield? just skip this step
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
#else
return STATE_FAILURE;
#endif

ParkingPlaceBehaviorInterface::PPInfo ppinfo;
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
Expand Down
22 changes: 15 additions & 7 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,11 @@ class JetAwaitingRunwayState : public State

ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
{
// no producer? just skip this step.
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
}
#else
return STATE_FAILURE;
#endif

// gotta reserve a space in order to reserve a runway
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), nullptr))
Expand Down Expand Up @@ -505,10 +506,13 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
jetAI->chooseLocomotorSet(LOCOMOTORSET_TAXIING);
DEBUG_ASSERTCRASH(jetAI->getCurLocomotor(), ("no loco"));

Object* airfield;
ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID(), &airfield);
ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
return STATE_SUCCESS; // no airfield? just skip this step.
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
#else
return STATE_FAILURE;
#endif

ParkingPlaceBehaviorInterface::PPInfo ppinfo;
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
Expand Down Expand Up @@ -747,7 +751,11 @@ class JetTakeoffOrLandingState : public AIFollowPathState

ParkingPlaceBehaviorInterface* pp = getPP(jet->getProducerID());
if (pp == nullptr)
return STATE_SUCCESS; // no airfield? just skip this step
#if RETAIL_COMPATIBLE_CRC
return STATE_SUCCESS;
#else
return STATE_FAILURE;
#endif

ParkingPlaceBehaviorInterface::PPInfo ppinfo;
if (!pp->reserveSpace(jet->getID(), jetAI->friend_getParkingOffset(), &ppinfo))
Expand Down
Loading