chore: storing version and changelog

This commit is contained in:
StraToN
2022-04-08 19:20:45 +00:00
parent 05f139ef1a
commit fda97352a0
11 changed files with 29 additions and 20 deletions

View File

@@ -50,14 +50,14 @@ func run(command_params: Array) -> int:
"",
ESCTransitionPlayer.TRANSITION_MODE.OUT
)
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
while yield(
escoria.main.scene_transition,
"transition_done"
) != transition_id:
pass
if command_params[0] == "main":
escoria.game_scene.hide_main_menu()
elif command_params[0] == "pause":

View File

@@ -49,14 +49,14 @@ func run(command_params: Array) -> int:
"",
ESCTransitionPlayer.TRANSITION_MODE.OUT
)
if transition_id != ESCTransitionPlayer.TRANSITION_ID_INSTANT:
while yield(
escoria.main.scene_transition,
"transition_done"
) != transition_id:
pass
if command_params[0] == "main":
escoria.game_scene.show_main_menu()
elif command_params[0] == "pause":

View File

@@ -137,7 +137,7 @@ func register_object(object: ESCObject, room: ESCRoom = null, force: bool = fals
# changes.
room_key.room_global_id = current_room_key.room_global_id
room_key.room_instance_id = current_room_key.room_instance_id
if not room_key.is_valid():
# This condition should very likely never happen.
escoria.logger.report_errors(
@@ -336,7 +336,7 @@ func unregister_object(object: ESCObject, room_key: ESCRoomObjectsKey) -> void:
"part of a 'forced' registration, ignore this warning."
]
)
return
var room_objects = _get_room_objects_objects(room_key)
@@ -473,13 +473,13 @@ func _object_exists_in_room(object: ESCObject, room_key: ESCRoomObjectsKey) -> b
"Cannot check for null objects."
]
)
return false
for room_container in room_objects:
if _compare_container_to_key(room_container, room_key) \
and room_container.objects.has(object.global_id):
return true
return false

View File

@@ -84,7 +84,7 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
escoria.logger.debug(
"Awaiting transition %s (out) to be finished." % transition_id
)
yield(escoria.main.scene_transition, "transition_done")
# Hide main and pause menus
@@ -229,7 +229,7 @@ func init_room(room: ESCRoom) -> void:
room,
true
)
if escoria.globals_manager.has(
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
):
@@ -293,7 +293,7 @@ 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
@@ -364,7 +364,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( \

View File

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

View File

@@ -296,7 +296,7 @@ func load_game(id: int):
## GLOBALS
for k in save_game.globals.keys():
var global_value = save_game.globals[k]
if global_value is String and global_value.empty():
global_value = "''"