oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: disallows user input during scene changes

Browse Source
This commit is contained in:
Duncan Brown
2022-05-04 18:11:09 -04:00
committed by Julian Murgia
parent acfb3d9ddd
commit c9c7cd2dfa
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
View File

@@ -51,6 +51,9 @@ func register_reserved_globals() -> void:
# - enable_automatic_transitions: Whether to play the transition between rooms # - enable_automatic_transitions: Whether to play the transition between rooms
# automatically or to leave the responsibility to the developer. # automatically or to leave the responsibility to the developer.
func change_scene(room_path: String, enable_automatic_transitions: bool) -> void: func change_scene(room_path: String, enable_automatic_transitions: bool) -> void:
# We're changing scenes, so users shouldn't be able to do stuff during.
escoria.game_scene.disable_all_input()
# Clear the event queue to remove other events (there could be duplicate # Clear the event queue to remove other events (there could be duplicate
# events in there so we avoid running these multiple times). Also sets a # events in there so we avoid running these multiple times). Also sets a
# flag indicating a changing scene and interrupts any other currently-running # flag indicating a changing scene and interrupts any other currently-running
@@ -323,6 +326,9 @@ func _perform_script_events(room: ESCRoom) -> void:
# Hide main and pause menus # Hide main and pause menus
escoria.game_scene.hide_main_menu() escoria.game_scene.hide_main_menu()
escoria.game_scene.unpause_game() escoria.game_scene.unpause_game()
# Make sure user input is allowed
escoria.game_scene.enable_all_input()
# Maybe this is ok to put in set_scene_finish() above? But it might be a bit # Maybe this is ok to put in set_scene_finish() above? But it might be a bit
# confusing to not see the matching camera.current updates. # confusing to not see the matching camera.current updates.

18
addons/escoria-core/game/core-scripts/esc_game.gd
View File

@@ -463,3 +463,21 @@ func escoria_show_ui():
# Manage signal room_deady from main.gd. # Manage signal room_deady from main.gd.
func _on_room_ready(): func _on_room_ready():
room_ready_for_inputs = true room_ready_for_inputs = true
# Disallows all input to the UI.
func disable_all_input() -> void:
# If we aren't part of a tree yet, we sure can't get the tree.
if get_tree() == null:
return
get_tree().get_root().set_disable_input(true)
# Allows all UI input.
func enable_all_input() -> void:
# If we aren't part of a tree yet, we sure can't get the tree.
if get_tree() == null:
return
get_tree().get_root().set_disable_input(false)