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

fix: handles the case where no coroutines are run as part of room creation; also fixes a small bug in ESCCamera

Browse Source
This commit is contained in:
Duncan Brown
2022-04-02 15:02:27 -04:00
committed by Julian Murgia
parent 503d6134dd
commit 85b86f38be
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,6 +269,10 @@ func init_room(room: ESCRoom) -> void:
#
# - room: The ESCRoom to be initialized for use.
func _perform_script_events(room: ESCRoom) -> void:
# Used to track whether any yields have been executed before the call to
# set_scene_finish.
var yielded: bool = false
if room.enabled_automatic_transitions \
and not room.is_run_directly \
and not room.exited_previous_room:
@@ -296,6 +300,8 @@ func _perform_script_events(room: ESCRoom) -> void:
rc = yield(escoria.event_manager, "event_finished")
if rc[0] != ESCExecution.RC_OK:
return rc[0]
yielded = true
# Hide main and pause menus
escoria.game_scene.hide_main_menu()
@@ -313,6 +319,11 @@ func _perform_script_events(room: ESCRoom) -> void:
if rc[0] != ESCExecution.RC_OK:
return rc[0]
yielded = true
if not yielded:
escoria.main.finish_current_scene_init(room)
escoria.main.set_scene_finish()
# We know the scene has been loaded. Make its global ID available for
@@ -360,7 +371,7 @@ func _perform_script_events(room: ESCRoom) -> void:
rc = yield(escoria.event_manager, "event_finished")
if rc[0] != ESCExecution.RC_OK:
return rc[0]
# Now that :ready is finished, if FORCE_LAST_SCENE_NULL was true, reset it
# to false
if escoria.globals_manager.get_global( \