From 2ee9fd432eefdd4aaa81ea353be5421f914fca6c Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 17 Jul 2026 04:22:03 -0400 Subject: [PATCH] Fix potential AppSetting script parse errors --- game/src/Autoload/MusicManager/MusicManager.gd | 2 +- game/src/Systems/Startup/GameStart.gd | 8 ++++---- game/src/UI/GameMenu/MainMenu/MainMenu.gd | 2 +- game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/game/src/Autoload/MusicManager/MusicManager.gd b/game/src/Autoload/MusicManager/MusicManager.gd index d2bc3656..4318e8b8 100644 --- a/game/src/Autoload/MusicManager/MusicManager.gd +++ b/game/src/Autoload/MusicManager/MusicManager.gd @@ -35,7 +35,7 @@ func _ready() -> void: add_ootb_music() #don't start the current song for compat mode, do that from #GameStart so we can wait until the music is loaded - var auto_start_music := GameSettings.get_setting(GameSettings.AUDIO_MUSIC_START_PLAY) + var auto_start_music: GameSettings.Setting = GameSettings.get_setting(GameSettings.AUDIO_MUSIC_START_PLAY) set_startup_music(auto_start_music.value()) diff --git a/game/src/Systems/Startup/GameStart.gd b/game/src/Systems/Startup/GameStart.gd index fc6d69cd..1e82c840 100644 --- a/game/src/Systems/Startup/GameStart.gd +++ b/game/src/Systems/Startup/GameStart.gd @@ -58,7 +58,7 @@ func _setup_compatibility_mode_paths() -> void: var arg_base_path: String = ArgumentParser.get_option_value(&"base-path") var arg_search_path: String = ArgumentParser.get_option_value(&"search-path") - var setting := Vic2Settings.get_setting(Vic2Settings.GENERAL_BASE_DEFINES_PATH) + var setting: Vic2Settings.Setting = Vic2Settings.get_setting(Vic2Settings.GENERAL_BASE_DEFINES_PATH) if arg_base_path: if arg_search_path: @@ -76,15 +76,15 @@ func _setup_compatibility_mode_paths() -> void: if Vic2Settings.get_base_defines_path().is_empty(): # Check if the program is being run from inside the install directory, # and if not also search for a Steam install - var root_base_path := Vic2Settings.find_base_path(".") + var root_base_path: String = Vic2Settings.find_base_path(".") if root_base_path.is_empty(): await Vic2Settings.show_base_path_find_dialog() else: setting.set_value(root_base_path) # Add mod paths - var load_list_setting := ModSettings.get_setting(ModSettings.MODS_LOAD_LIST) - var load_list := ModSettings.get_load_list() + var load_list_setting: ModSettings.Setting = ModSettings.get_setting(ModSettings.MODS_LOAD_LIST) + var load_list: PackedStringArray = ModSettings.get_load_list() for mod in ArgumentParser.get_option_value(&"mod"): if mod not in load_list and mod != "": load_list.append(mod) diff --git a/game/src/UI/GameMenu/MainMenu/MainMenu.gd b/game/src/UI/GameMenu/MainMenu/MainMenu.gd index d831b3d1..90942a6e 100644 --- a/game/src/UI/GameMenu/MainMenu/MainMenu.gd +++ b/game/src/UI/GameMenu/MainMenu/MainMenu.gd @@ -20,7 +20,7 @@ var _language_button: SettingsContainer.EnumOptionButton func _ready() -> void: _on_new_game_button_visibility_changed() - var language_setting := GameSettings.get_setting(GameSettings.GENERAL_LANGUAGE) + var language_setting: GameSettings.Setting = GameSettings.get_setting(GameSettings.GENERAL_LANGUAGE) _language_button = SettingsContainer.EnumOptionButton.new(language_setting) _language_button.size_flags_horizontal = Control.SIZE_SHRINK_END _bottom_margin.add_child(_language_button) diff --git a/game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd b/game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd index 2c0a3c32..36305b08 100644 --- a/game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd +++ b/game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd @@ -98,7 +98,7 @@ func _try_update(key: StringName) -> void: func _on_setting_applied(key: StringName) -> void: if not key.begins_with(section_key + "/"): return - var stg := GameSettings.get_setting(key) + var stg: GameSettings.Setting = GameSettings.get_setting(key) if not stg.has_meta(&"revert_value"): return var previous_value: Variant = stg.get_meta(&"revert_value")