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

fix: add code to handle scenes run directly from the Godot editor and allow for the current room to be set in the object manager, allowing proper setup

Browse Source
This commit is contained in:
Duncan Brown
2022-03-30 14:59:29 -04:00
committed by Julian Murgia
parent 2508786cde
commit c87e853ba6
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd
View File

@@ -317,12 +317,13 @@ func unregister_object(object: ESCObject, room_key: ESCRoomObjectsKey) -> void:
"ESCObjectManager:unregister_object()",
[
"Unable to unregister object.",
"Object with global ID %s room (%s, %s) not found." %
"Object with global ID %s room (%s, %s) not found. If this was" %
[
"?" if object == null else object.global_id,
room_key.room_global_id,
room_key.room_instance_id
]
],
"part of a 'forced' registration, ignore this warning."
]
)

5
addons/escoria-core/game/core-scripts/log/esc_logger.gd
View File

@@ -205,7 +205,10 @@ func error(string: String, args = [], do_savegame: bool = true):
_log(message, true)
escoria.set_game_paused(true)
escoria.main.current_scene.game.show_crash_popup(files_to_send)
if is_instance_valid(escoria.main.current_scene):
escoria.main.current_scene.game.show_crash_popup(files_to_send)
assert(false)