From b27f79b0f748c915c0170d6730d9553494589f86 Mon Sep 17 00:00:00 2001 From: Jowan-Spooner <42868150+Jowan-Spooner@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:42:08 +0100 Subject: [PATCH] Small fixes (#2079) * Adjust style cloning logic * Emit Background Changed signal even when no Backgroundholder is present --- addons/dialogic/Modules/Background/subsystem_backgrounds.gd | 4 +++- addons/dialogic/Resources/dialogic_style.gd | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/dialogic/Modules/Background/subsystem_backgrounds.gd b/addons/dialogic/Modules/Background/subsystem_backgrounds.gd index cd1409821..14263633e 100644 --- a/addons/dialogic/Modules/Background/subsystem_backgrounds.gd +++ b/addons/dialogic/Modules/Background/subsystem_backgrounds.gd @@ -40,10 +40,12 @@ func update_background(scene := "", argument := "", fade_time := 0.0, transition background_holder = dialogic.Styles.get_first_node_in_layout('dialogic_background_holders') else: background_holder = get_tree().get_first_node_in_group('dialogic_background_holders') + + var info := {'scene':scene, 'argument':argument, 'fade_time':fade_time, 'same_scene':false} if background_holder == null: + background_changed.emit(info) return - var info := {'scene':scene, 'argument':argument, 'fade_time':fade_time, 'same_scene':false} var bg_set := false diff --git a/addons/dialogic/Resources/dialogic_style.gd b/addons/dialogic/Resources/dialogic_style.gd index 2fb0b664e..85dc86895 100644 --- a/addons/dialogic/Resources/dialogic_style.gd +++ b/addons/dialogic/Resources/dialogic_style.gd @@ -174,7 +174,7 @@ func clone() -> DialogicStyle: var style := DialogicStyle.new() style.name = name if base_scene != null: - style.base_scene = base_scene.duplicate() + style.base_scene = base_scene style.inherits = inherits style.base_overrides = base_overrides for layer_idx in range(get_layer_count()):