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

Manage save game in case of room loading failure (#441)

Browse Source
This commit is contained in:
Julian Murgia
2021-11-15 09:18:15 +01:00
committed by GitHub
parent a117a8dccf
commit 729a60f6c0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/escoria-core/game/core-scripts/esc/types/esc_object.gd
View File

@@ -70,7 +70,8 @@ func get_save_data() -> Dictionary:
save_data["interactive"] = self.interactive save_data["interactive"] = self.interactive
save_data["state"] = self.state save_data["state"] = self.state
if self.node.get("is_movable") and self.node.is_movable: if is_instance_valid(self.node) and \
self.node.get("is_movable") and self.node.is_movable:
save_data["global_transform"] = self.node.global_transform save_data["global_transform"] = self.node.global_transform
save_data["last_deg"] = wrapi(self.node._movable._get_angle() + 1, 0, 360) save_data["last_deg"] = wrapi(self.node._movable._get_angle() + 1, 0, 360)
save_data["last_dir"] = self.node._movable.last_dir save_data["last_dir"] = self.node._movable.last_dir

3
addons/escoria-core/game/core-scripts/esc_room.gd
View File

@@ -180,7 +180,8 @@ func perform_script_events():
) )
escoria.globals_manager.set_global( escoria.globals_manager.set_global(
"ESC_LAST_SCENE", "ESC_LAST_SCENE",
escoria.main.current_scene.global_id, escoria.main.current_scene.global_id \
if escoria.main.current_scene != null else "",
true true
) )

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

@@ -126,7 +126,9 @@ func set_camera_limits(camera_limit_id: int = 0) -> void:
func save_game(p_savegame_res: Resource) -> void: func save_game(p_savegame_res: Resource) -> void:
p_savegame_res.main = { p_savegame_res.main = {
ESCSaveGame.MAIN_LAST_SCENE_GLOBAL_ID_KEY: last_scene_global_id, ESCSaveGame.MAIN_LAST_SCENE_GLOBAL_ID_KEY: last_scene_global_id,
ESCSaveGame.MAIN_CURRENT_SCENE_FILENAME_KEY: current_scene.filename ESCSaveGame.MAIN_CURRENT_SCENE_FILENAME_KEY: current_scene.filename \
if current_scene != null \
else "No current scene (not loaded yet)"
} }