From 9398ce96c376c4214e0cc85f9d4509c6b2a28818 Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Sat, 3 Dec 2022 18:56:47 -0500 Subject: [PATCH] fix: restores state on returning; for some reason, previously state was modified but never restored. --- .../escoria-core/game/core-scripts/esc/types/esc_dialog.gd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd b/addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd index 77fe9d5c..6bba22e2 100644 --- a/addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd +++ b/addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd @@ -80,7 +80,11 @@ func run(): self, "Starting dialog." ) + + # Since we're changing state, we need to remember and reset it once we're done + var previous_state = escoria.current_state escoria.current_state = escoria.GAME_STATE.DIALOG + if !escoria.dialog_player: escoria.dialog_player = escoria.main.current_scene.get_node( "game/ui/dialog_layer/dialog_player" @@ -103,4 +107,6 @@ func run(): if rc != ESCExecution.RC_CANCEL: return self.run() + escoria.current_state = previous_state + return rc