From 6062255177142fe38c84743baa793318e9d2013e Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 22 Sep 2021 00:11:19 +0200 Subject: [PATCH] Updated the engine to the latest. Also removed "as" casts after get_node_or_null-s, as now when they return null you get an error. --- HEADS | 2 +- game/player/Body.gd | 6 +++--- game/ui/vendor_window/VendorWindow.gd | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HEADS b/HEADS index ad6bbefe..8a1edbeb 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "f85ad007c0adbedbf9e331615242259cfd5a6e60"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "49b594130dd80e05ef29297055a31fe8ffa09ffb"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "92b6066d026ba8bfec62282063c372f5ec76dea4"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "86de26c2c7a15185658680ae79c39a0c8bb159ce"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "d67b77c59798f9fb6334798f8057c6e725149e6a"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "49b594130dd80e05ef29297055a31fe8ffa09ffb"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "92b6066d026ba8bfec62282063c372f5ec76dea4"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "86de26c2c7a15185658680ae79c39a0c8bb159ce"}} \ No newline at end of file diff --git a/game/player/Body.gd b/game/player/Body.gd index 6bc9540c..ae8d0609 100644 --- a/game/player/Body.gd +++ b/game/player/Body.gd @@ -116,8 +116,8 @@ var _nameplate : Node = null #var los : bool = false func _ready() -> void: - camera = get_node_or_null("CameraPivot/Camera") as Camera - camera_pivot = get_node_or_null("CameraPivot") as Spatial + camera = get_node_or_null("CameraPivot/Camera") + camera_pivot = get_node_or_null("CameraPivot") model_rotation_node = get_node(model_path) character_skeleton = get_node(character_skeleton_path) @@ -683,7 +683,7 @@ func cmouseover(event): if result: if result.collider:# and result.collider.owner is Entity: - var mo : Entity = result.collider.owner as Entity + var mo : Entity = result.collider.owner if mo == null: return diff --git a/game/ui/vendor_window/VendorWindow.gd b/game/ui/vendor_window/VendorWindow.gd index f71c2ad5..2d2a2f3c 100644 --- a/game/ui/vendor_window/VendorWindow.gd +++ b/game/ui/vendor_window/VendorWindow.gd @@ -47,7 +47,7 @@ var _vendor_item_data : VendorItemData var _timer : float = 0 func _ready() -> void: - opener_button = get_node_or_null(opener_button_path) as BaseButton + opener_button = get_node_or_null(opener_button_path) _item_entries.clear()