fix: eliminates intermittent flicker with UI; NO_UI shouldn't be allo…

…wed for :setup events
godot-escoria · Apr 30, 2022 · f69b29d · f69b29d
1 parent eeb7042
commit f69b29d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/addons/escoria-core/game/main.gd b/addons/escoria-core/game/main.gd
@@ -222,6 +222,8 @@ func check_game_scene_methods():
 
 	assert(current_scene.game.has_method("hide_ui"))
 	assert(current_scene.game.has_method("show_ui"))
+	assert(current_scene.game.has_method("escoria_hide_ui"))
+	assert(current_scene.game.has_method("escoria_show_ui"))
 	assert(current_scene.game.has_method("_on_event_done"))
 
 

diff --git a/addons/escoria-ui-keyboard-9verbs/game.tscn b/addons/escoria-ui-keyboard-9verbs/game.tscn
@@ -17,6 +17,7 @@ bg_color = Color( 0.6, 0.6, 0.6, 0.5 )
 script = ExtResource( 5 )
 main_menu = NodePath("ui/main_menu")
 pause_menu = NodePath("ui/pause_menu")
+ui_parent_control_node = NodePath("ui/Control")
 
 [node name="dialog_layer" type="CanvasLayer" parent="."]
 

diff --git a/addons/escoria-ui-simplemouse/game.tscn b/addons/escoria-ui-simplemouse/game.tscn
@@ -15,6 +15,7 @@ script = ExtResource( 5 )
 main_menu = NodePath("CanvasLayer/main_menu")
 pause_menu = NodePath("CanvasLayer/pause_menu")
 editor_debug_mode = 1
+ui_parent_control_node = NodePath("CanvasLayer/ui")
 
 [node name="camera" parent="." instance=ExtResource( 3 )]
 

diff --git a/game/rooms/intro/esc/intro.esc b/game/rooms/intro/esc/intro.esc
@@ -1,4 +1,4 @@
-:setup | NO_UI
+:setup
 anim_block intro_animation_player RESET
 
 :ready | NO_UI