tweak(behavior): Make aircraft takeoff order deterministic #1297
Conversation
Caball009
added
China
GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Outdated
Show resolved
Hide resolved
|
@xezon I made a small adjustment to the code to make it a bit more flexible. Airfields with equal counts of spaces and runways are excluded. Index checks are now tied to the runway count so that it can now handle this 3 runway / 6 space airfield: https://www.moddb.com/mods/operation-firestorm/images/usa-airforce-generals-airfield If there are airfields with say 2 runways and more than 4 spaces (i.e. more than double the runway count), the fix in this PR will not work 100%. I'm not sure how to fix that yet or if such airfields even exist. |
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Outdated
Show resolved
Hide resolved
…l009/GeneralsGameCode into fix_airfield_takeoff_order
|
I can replicate this in Generals if there are no other issues. |
|
Should be good to go. |
|
I figured it'd be good to provide some visual aid. This is the layout of the USA airfield:
// TheSuperHackers @tweak Block the first attempt to reserve a runway for 'upper' space indices.
// This allows 'lower' space indices to reserve a runway first to ensure deterministic takeoff ordering.
if (m_spaces.size() > m_runways.size() && spaceIndex >= m_runways.size())Block the first attempt from S2 and S3 to reserve a runway, so that S0 and S1 can always go first. |
xezon
changed the title
The order in which aircraft take off from airfields is non-deterministic, which can cause delays between pairs of aircraft taking off. This PR defers an airfield runway reservation request once, if that request came from a 'lower priority' space.
TODO