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

Clean after change room: game scene is cleanly removed from prev room (#416)

Browse Source
This commit is contained in:
Julian Murgia
2021-10-19 15:48:26 +02:00
committed by GitHub
parent 4fd1d72993
commit 89da6924a3
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/escoria-core/game/core-scripts/esc/commands/change_scene.gd
View File

@@ -83,6 +83,10 @@ func run(command_params: Array) -> int:
]
)
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
var room_scene = res_room.instance()
if room_scene:

7
addons/escoria-core/game/main.gd
View File

@@ -40,9 +40,9 @@ func set_scene(p_scene: Node) -> void:
if current_scene != null:
clear_scene()
add_child(p_scene)
if not p_scene in get_children():
add_child(p_scene)
move_child(p_scene, 0)
current_scene = p_scene
check_game_scene_methods()
@@ -59,7 +59,8 @@ func clear_scene() -> void:
escoria.action_manager.clear_current_action()
escoria.action_manager.clear_current_tool()
current_scene.remove_child(escoria.game_scene)
if escoria.game_scene.get_parent() == current_scene:
current_scene.remove_child(escoria.game_scene)
remove_child(current_scene)
current_scene.free()