From 137d696a211fc7d1b17cb50ce2ad975abb42aa80 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Thu, 23 Jan 2025 23:56:18 +0100 Subject: [PATCH] fix(ItemWithTooltip): call super._ready() on _ready() --- .../esc_item_with_tooltip.gd | 1 + .../overrides/esc_object_manager.gd | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd index 58aab820..3d4f76d5 100644 --- a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd +++ b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd @@ -17,6 +17,7 @@ var components: Dictionary = {} func _ready(): + super._ready() register_components() diff --git a/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd index 93facee5..99ddc03a 100644 --- a/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd +++ b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd @@ -344,7 +344,7 @@ func get_object(global_id: String, room: ESCRoom = null) -> ESCObject: else: escoria.logger.warn( self, - "Object with global id %s in room instance (%s, %s) not found." + "Object with global id %s in room instance (%s, %s) not found. This can be safely ignored if a room was being searched for." % [global_id, room_key.room_global_id, room_key.room_instance_id] ) if escoria.inventory_manager.inventory_has(global_id): @@ -460,10 +460,10 @@ func save_game(p_savegame: ESCSaveGame) -> void: func get_start_location() -> ESCLocation: if _room_exists(current_room_key): for object in _get_room_objects_objects(current_room_key).values(): - if is_instance_valid(object.node) \ - and object.node is ESCLocation \ - and object.node.is_start_location: - return object + if is_instance_valid(object.node): + var loc := object.node as ESCLocation + if loc and loc.is_start_location: + return loc escoria.logger.warn( self,