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 bug w.r.t. OffMapSpawn CPs starting cold

Browse Source
This commit is contained in:
Raffson 2024-05-11 17:04:43 +02:00
parent a27663e4b6
commit d3e1a1df92
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt_ui/windows/mission/flight/QFlightCreator.py
View File

@ -107,7 +107,7 @@ class QFlightCreator(QDialog):
self.restore_start_type: Optional[str] = None self.restore_start_type: Optional[str] = None
self.start_type = QComboBox() self.start_type = QComboBox()
for start_type in StartType: for start_type in StartType:
self.start_type.addItem(start_type.value, start_type) self.start_type.addItem(start_type.value, userData=start_type)
self.start_type.setCurrentText(self.game.settings.default_start_type.value) self.start_type.setCurrentText(self.game.settings.default_start_type.value)
layout.addLayout( layout.addLayout(
QLabeledWidget( QLabeledWidget(
@ -116,8 +116,8 @@ class QFlightCreator(QDialog):
tooltip="Selects the start type for this flight.", tooltip="Selects the start type for this flight.",
) )
) )
if squadron is not None and isinstance(squadron.location, OffMapSpawn): required_start_type = squadron.location.required_aircraft_start_type
self.start_type.setCurrentText(StartType.IN_FLIGHT.value) if squadron is not None and required_start_type:
self.start_type.setEnabled(False) self.start_type.setEnabled(False)
layout.addWidget( layout.addWidget(
QLabel( QLabel(
@ -275,8 +275,14 @@ class QFlightCreator(QDialog):
# https://github.com/dcs-liberation/dcs_liberation/issues/1567 # https://github.com/dcs-liberation/dcs_liberation/issues/1567
roster = self.roster_editor.roster roster = self.roster_editor.roster
required_start_type = None
squadron = self.squadron_selector.currentData()
if squadron:
required_start_type = squadron.location.required_aircraft_start_type
if roster is not None and roster.player_count > 0: if required_start_type:
start_type = required_start_type
elif roster is not None and roster.player_count > 0:
start_type = self.game.settings.default_start_type_client start_type = self.game.settings.default_start_type_client
else: else:
start_type = self.game.settings.default_start_type start_type = self.game.settings.default_start_type