From 26e4e4c1a3e5b7765c3c122cdbda8166a6c52558 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Tue, 15 Mar 2022 07:45:00 +0100 Subject: [PATCH] fix: Ensure escoria#apply_settings only called in game not editor (#543) Co-authored-by: balloonpopper <5151242+balloonpopper@users.noreply.github.com> Co-authored-by: Julian Murgia --- addons/escoria-core/game/escoria.gd | 47 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/addons/escoria-core/game/escoria.gd b/addons/escoria-core/game/escoria.gd index c493560f..2cdcbae0 100644 --- a/addons/escoria-core/game/escoria.gd +++ b/addons/escoria-core/game/escoria.gd @@ -179,31 +179,32 @@ func new_game(): # # * p_settings: Loaded settings func apply_settings(p_settings: ESCSaveSettings) -> void: - logger.info("******* settings loaded") - if p_settings != null: - settings = p_settings - else: - settings = ESCSaveSettings.new() + if not Engine.is_editor_hint(): + logger.info("******* settings loaded") + if p_settings != null: + settings = p_settings + else: + settings = ESCSaveSettings.new() - AudioServer.set_bus_volume_db( - AudioServer.get_bus_index(BUS_MASTER), - linear2db(settings.master_volume) - ) - AudioServer.set_bus_volume_db( - AudioServer.get_bus_index(BUS_SFX), - linear2db(settings.sfx_volume) - ) - AudioServer.set_bus_volume_db( - AudioServer.get_bus_index(BUS_MUSIC), - linear2db(settings.music_volume) - ) - AudioServer.set_bus_volume_db( - AudioServer.get_bus_index(BUS_SPEECH), - linear2db(settings.speech_volume) - ) - TranslationServer.set_locale(settings.text_lang) + AudioServer.set_bus_volume_db( + AudioServer.get_bus_index(BUS_MASTER), + linear2db(settings.master_volume) + ) + AudioServer.set_bus_volume_db( + AudioServer.get_bus_index(BUS_SFX), + linear2db(settings.sfx_volume) + ) + AudioServer.set_bus_volume_db( + AudioServer.get_bus_index(BUS_MUSIC), + linear2db(settings.music_volume) + ) + AudioServer.set_bus_volume_db( + AudioServer.get_bus_index(BUS_SPEECH), + linear2db(settings.speech_volume) + ) + TranslationServer.set_locale(settings.text_lang) - game_scene.apply_custom_settings(settings.custom_settings) + game_scene.apply_custom_settings(settings.custom_settings) # Input function to manage specific input keys