From 958c8b441b3f4be576dd9a08acc1edd64343d049 Mon Sep 17 00:00:00 2001 From: Julian Murgia Date: Thu, 15 Jul 2021 09:41:29 +0200 Subject: [PATCH] Fix settings being applied a second time with wrong data (#308) --- .../game/core-scripts/save_data/esc_save_manager.gd | 7 +++---- addons/escoria-core/game/escoria.gd | 1 - game/ui/commons/options/options.gd | 8 ++------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd b/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd index 9f0d121c..a0a20407 100644 --- a/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd +++ b/addons/escoria-core/game/core-scripts/save_data/esc_save_manager.gd @@ -192,7 +192,8 @@ func save_settings(): ["There was an issue writing settings %s" % save_path]) # Load the game settings from the settings file -func load_settings(): +# **Returns** The Resource structure loaded from settings file +func load_settings() -> Resource: var save_settings_path: String = settings_folder.plus_file(SETTINGS_TEMPLATE) var file: File = File.new() if not file.file_exists(save_settings_path): @@ -201,7 +202,5 @@ func load_settings(): ["Settings file %s doesn't exist" % save_settings_path, "Setting default settings."]) save_settings() - return - var settings_resource: Resource = load(save_settings_path) - escoria._on_settings_loaded(settings_resource) + return load(save_settings_path) diff --git a/addons/escoria-core/game/escoria.gd b/addons/escoria-core/game/escoria.gd index 246e1571..9f506b29 100644 --- a/addons/escoria-core/game/escoria.gd +++ b/addons/escoria-core/game/escoria.gd @@ -385,5 +385,4 @@ func _on_settings_loaded(p_settings: ESCSaveSettings) -> void: linear2db(settings.music_volume) ) TranslationServer.set_locale(settings.text_lang) -# music_volume_changed() diff --git a/game/ui/commons/options/options.gd b/game/ui/commons/options/options.gd index fa6bd715..333759e5 100644 --- a/game/ui/commons/options/options.gd +++ b/game/ui/commons/options/options.gd @@ -3,16 +3,12 @@ extends Control signal back_button_pressed onready var settings_changed = false -onready var backup_settings - - -func _ready(): - initialize_options(escoria.settings) +var backup_settings func show(): backup_settings = escoria.settings.duplicate() - initialize_options(backup_settings) + initialize_options(escoria.settings) visible = true