Skip to content

Fix potential AppSetting script parse errors #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Spartan322 merged 1 commit into from
Jul 17, 2026
Merged

Fix potential AppSetting script parse errors #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion game/src/Autoload/MusicManager/MusicManager.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())


Expand Down
8 changes: 4 additions & 4 deletions game/src/Systems/Startup/GameStart.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion game/src/UI/GameMenu/MainMenu/MainMenu.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion game/src/UI/GameMenu/OptionMenu/SettingsContainer.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading