weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #199

Browse Source 
Adjust 'should_halt_sim' conditions for taxi & takeoff flight-states, fixing an infinite loop that would occur if the FF-interrupt setting would not match with the start-type of the flight
This commit is contained in:
Raffson 2023-08-19 15:13:44 +02:00
parent 4901443b7a
commit 8a6b7b172c
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/ato/flightstate/takeoff.py
View File

@ -45,7 +45,8 @@ class Takeoff(AtDeparture):
def should_halt_sim(self) -> bool: def should_halt_sim(self) -> bool:
if ( if (
self.flight.client_count > 0 self.flight.client_count > 0
and self.settings.player_mission_interrupts_sim_at is StartType.RUNWAY and self.settings.player_mission_interrupts_sim_at
is [StartType.COLD, StartType.WARM, StartType.RUNWAY]
): ):
logging.info( logging.info(
f"Interrupting simulation because {self.flight} has players and has " f"Interrupting simulation because {self.flight} has players and has "

3
game/ato/flightstate/taxi.py
View File

@ -37,7 +37,8 @@ class Taxi(AtDeparture):
def should_halt_sim(self) -> bool: def should_halt_sim(self) -> bool:
if ( if (
self.flight.client_count > 0 self.flight.client_count > 0
and self.settings.player_mission_interrupts_sim_at is StartType.WARM and self.settings.player_mission_interrupts_sim_at
in [StartType.COLD, StartType.WARM]
): ):
logging.info( logging.info(
f"Interrupting simulation because {self.flight} has players and has " f"Interrupting simulation because {self.flight} has players and has "

3
game/settings/settings.py
View File

@ -536,9 +536,8 @@ class Settings:
"Player missions interrupt fast forward", "Player missions interrupt fast forward",
page=MISSION_GENERATOR_PAGE, page=MISSION_GENERATOR_PAGE,
section=GAMEPLAY_SECTION, section=GAMEPLAY_SECTION,
default=None, default=StartType.COLD,
choices={ choices={
"Never": None,
"At startup time": StartType.COLD, "At startup time": StartType.COLD,
"At taxi time": StartType.WARM, "At taxi time": StartType.WARM,
"At takeoff time": StartType.RUNWAY, "At takeoff time": StartType.RUNWAY,