Support fixes (#445)

Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-17 22:27:57 +01:00
committed by GitHub
parent 58c7484338
commit 37b0c6c0f1
3 changed files with 13 additions and 6 deletions

View File

@@ -92,6 +92,7 @@ func activate(
if event_returned[0] == ESCExecution.RC_OK:
escoria.action_manager\
.clear_current_action()
emit_signal("action_finished")
return event_returned[0]
elif combine_with.events.has(combine_with_event)\
and not combine_with.node.combine_is_one_way:
@@ -137,8 +138,10 @@ func activate(
escoria.logger.report_warnings(
"ESCActionManager.activate: Invalid action on item",
[
"Trying to combine object %s with %s, "+
"but %s is not in inventory." % [
(
"Trying to combine object %s with %s, "+
"but %s is not in inventory."
) % [
target.global_id,
combine_with.global_id,
combine_with.global_id

View File

@@ -62,8 +62,10 @@ func _ready():
if camera_limits.empty():
camera_limits.push_back(Rect2())
if camera_limits.size() == 1 and camera_limits[0].has_no_area():
camera_limits[0] = \
Rect2(0, 0, $background.rect_size.x, $background.rect_size.y)
for child in get_children():
if child is ESCBackground:
camera_limits[0] = \
Rect2(0, 0, child.rect_size.x, child.rect_size.y)
if Engine.is_editor_hint():
return

View File

@@ -183,7 +183,8 @@ func mousewheel_action(_direction: int):
func hide_ui():
$ui/Control.hide()
verbs_menu.hide()
room_select.hide()
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
room_select.hide()
inventory_ui.hide()
tooltip.hide()
@@ -191,7 +192,8 @@ func hide_ui():
func show_ui():
$ui/Control.show()
verbs_menu.show()
room_select.show()
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
room_select.show()
inventory_ui.show()
tooltip.show()