From d3db65fb8ebb225c005135ac3ce5a0948dc0f58b Mon Sep 17 00:00:00 2001 From: Kex Date: Thu, 24 Oct 2024 21:55:15 +0200 Subject: [PATCH] Fix mission header settings from different components override each other (#125) Call super for overrides of ApplyToSettingsConfig --- .../scripts/Game/ACE_Finger/Mission/ACE_MissionHeaderSettings.c | 2 ++ .../Game/ACE_Medical/Mission/ACE_MissionHeaderSettings.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/addons/finger/scripts/Game/ACE_Finger/Mission/ACE_MissionHeaderSettings.c b/addons/finger/scripts/Game/ACE_Finger/Mission/ACE_MissionHeaderSettings.c index 741cf688..250062b6 100644 --- a/addons/finger/scripts/Game/ACE_Finger/Mission/ACE_MissionHeaderSettings.c +++ b/addons/finger/scripts/Game/ACE_Finger/Mission/ACE_MissionHeaderSettings.c @@ -10,6 +10,8 @@ modded class ACE_MissionHeaderSettings //! Applies settings from mission header to config override void ApplyToSettingsConfig(notnull ACE_SettingsConfig config) { + super.ApplyToSettingsConfig(config); + if (m_ACE_Finger_Settings) config.SetModSettings(m_ACE_Finger_Settings); } diff --git a/addons/medical/scripts/Game/ACE_Medical/Mission/ACE_MissionHeaderSettings.c b/addons/medical/scripts/Game/ACE_Medical/Mission/ACE_MissionHeaderSettings.c index 56a0695d..a616f57e 100755 --- a/addons/medical/scripts/Game/ACE_Medical/Mission/ACE_MissionHeaderSettings.c +++ b/addons/medical/scripts/Game/ACE_Medical/Mission/ACE_MissionHeaderSettings.c @@ -10,6 +10,8 @@ modded class ACE_MissionHeaderSettings //! Applies settings from mission header to config override void ApplyToSettingsConfig(notnull ACE_SettingsConfig config) { + super.ApplyToSettingsConfig(config); + if (m_ACE_Medical_Settings) config.SetModSettings(m_ACE_Medical_Settings); }