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

fix: moves game scene removal/addition to room until after transition; still needs testing, especially w instant transitions

Browse Source
This commit is contained in:
Duncan Brown
2022-04-13 16:32:14 -04:00
committed by Julian Murgia
parent eac4385b81
commit 8d1b00bb90
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,10 +89,6 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
] ]
) )
if escoria.main.current_scene \
and escoria.game_scene.get_parent() == escoria.main.current_scene:
escoria.main.current_scene.remove_child(escoria.game_scene)
# Load room scene # Load room scene
var res_room = escoria.resource_cache.get_resource(room_path) var res_room = escoria.resource_cache.get_resource(room_path)
@@ -106,16 +102,6 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
else: else:
room_scene.enabled_automatic_transitions = enable_automatic_transitions room_scene.enabled_automatic_transitions = enable_automatic_transitions
# If the game scene is already in the tree but not a child of the room
# we remove it
if escoria.game_scene.is_inside_tree() \
and escoria.game_scene.get_parent() != room_scene:
var game_parent = escoria.game_scene.get_parent()
game_parent.remove_child(escoria.game_scene)
room_scene.add_child(escoria.game_scene)
room_scene.move_child(escoria.game_scene, 0)
room_scene.game = escoria.game_scene
escoria.main.set_scene(room_scene) escoria.main.set_scene(room_scene)
# We know the scene has been loaded. Make its global ID available for # We know the scene has been loaded. Make its global ID available for
@@ -233,6 +219,20 @@ func _perform_script_events(room: ESCRoom) -> void:
# With the room transitioned out, finish any room prep and run :setup if # With the room transitioned out, finish any room prep and run :setup if
# it exists. # it exists.
if escoria.main.current_scene \
and escoria.game_scene.get_parent() == escoria.main.current_scene:
escoria.main.current_scene.remove_child(escoria.game_scene)
# If the game scene is already in the tree but not a child of the room
# we remove it
if escoria.game_scene.is_inside_tree() \
and escoria.game_scene.get_parent() != room:
var game_parent = escoria.game_scene.get_parent()
game_parent.remove_child(escoria.game_scene)
room.add_child(escoria.game_scene)
room.move_child(escoria.game_scene, 0)
room.game = escoria.game_scene
# We must first et the camera limits, and then worry about subsequent # We must first et the camera limits, and then worry about subsequent
# player setup since it relies on this. # player setup since it relies on this.