From 3e3b480ac37012809c1f33745c04dc40f189fdb9 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 20 Jul 2020 01:35:53 +0200 Subject: [PATCH] Update the engine. --- HEADS | 2 +- game/scenes/CharacterSelector.gd | 5 ++--- game/scenes/CharacterSelectorMenu.gd | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HEADS b/HEADS index 65eca402..70ee3611 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "882008ac7f0b6edf3a1de4481cd41b23f621d25b"}, "entity_spell_system": {"master": "af1bd74fbf38d0ac42d3cf203feb3c7212d01849"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "c9ee935af3ee1bc463e6ae0b96d23667232123b1"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ No newline at end of file +{"engine": {"3.2": "89f57ae12244f3269c9e3fe4684e16ec1fd2c989", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "882008ac7f0b6edf3a1de4481cd41b23f621d25b"}, "entity_spell_system": {"master": "af1bd74fbf38d0ac42d3cf203feb3c7212d01849"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "c9ee935af3ee1bc463e6ae0b96d23667232123b1"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ No newline at end of file diff --git a/game/scenes/CharacterSelector.gd b/game/scenes/CharacterSelector.gd index 884bebdf..99bab6dd 100644 --- a/game/scenes/CharacterSelector.gd +++ b/game/scenes/CharacterSelector.gd @@ -44,9 +44,8 @@ func refresh(): while (file_name != ""): if dir.current_is_dir(): file_name = dir.get_next() - - - else: + #workaround for https://github.com/godotengine/godot/issues/40509 + dir.open("user://") dir.make_dir("user://" + character_folder) diff --git a/game/scenes/CharacterSelectorMenu.gd b/game/scenes/CharacterSelectorMenu.gd index 0edb0522..34a4018e 100644 --- a/game/scenes/CharacterSelectorMenu.gd +++ b/game/scenes/CharacterSelectorMenu.gd @@ -134,6 +134,8 @@ func refresh(): get_node(load_button_path).hide() get_node(renounce_button_path).hide() else: + #workaround for https://github.com/godotengine/godot/issues/40509 + dir.open("user://") dir.make_dir("user://" + character_folder) if only_one_character: get_node(container_path).hide() @@ -179,6 +181,7 @@ func renounce_character() -> void: if f.file_exists(file_name): var d : Directory = Directory.new() + d.open(file_name.get_base_dir()) if d.remove(file_name) == OK: refresh()