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

Reverted setting ESC_LAST_SCENE too early in ESCRoom (#464)

Browse Source
This commit is contained in:
Julian Murgia
2021-11-25 23:44:20 +01:00
committed by GitHub
parent a5d7691846
commit 3a43bac46e
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,12 +147,27 @@ func perform_script_events():
":transition_out",
"transition %s out" % ProjectSettings.get_setting(
"escoria/ui/default_transition"
)
),
"wait 0.1"
])
escoria.event_manager.queue_event(
script_transition_out.events['transition_out']
)
# Unpause the game if it was
escoria.set_game_paused(false)
# Wait for transition_out event to be done
var rc = yield(escoria.event_manager, "event_finished")
while rc[1] != "transition_out":
rc = yield(escoria.event_manager, "event_finished")
if rc[0] != ESCExecution.RC_OK:
return rc[0]
# Hide main and pause menus
escoria.game_scene.hide_main_menu()
escoria.game_scene.unpause_game()
# Run the setup event
_run_script_event("setup")
@@ -178,7 +193,6 @@ func perform_script_events():
if ready_event_added:
# Wait for ready event to be done
var rc = yield(escoria.event_manager, "event_finished")
while rc[1] != "ready":
rc = yield(escoria.event_manager, "event_finished")