Fix crashes in rooms 9 and 13 (#415)

This commit is contained in:
Julian Murgia
2021-10-19 15:48:13 +02:00
committed by GitHub
parent 2e7370e153
commit 4fd1d72993
4 changed files with 10 additions and 10 deletions

View File

@@ -27,7 +27,7 @@ func validate(arguments: Array):
]
)
return false
if not escoria.globals_manager.get(arguments[0]) is int:
if not escoria.globals_manager.get_global(arguments[0]) is int:
escoria.logger.report_errors(
"inc_global: invalid global",
[

View File

@@ -195,7 +195,7 @@ func target_reached():
func _process(_delta):
zoom_transform = self.get_canvas_transform()
if follow_target and not tween.is_active() and follow_target.has_moved():
if is_instance_valid(follow_target) and not tween.is_active() and follow_target.has_moved():
self.global_position = follow_target.global_position
func _ready():

View File

@@ -42,13 +42,14 @@ func _enter_tree():
## BACKGROUND ##
func left_click_on_bg(position: Vector2) -> void:
escoria.do(
"walk",
[escoria.main.current_scene.player.global_id, position],
true
)
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_by_name("walk")
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
if escoria.main.current_scene.player:
escoria.do(
"walk",
[escoria.main.current_scene.player.global_id, position],
true
)
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_by_name("walk")
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
func right_click_on_bg(position: Vector2) -> void:
mousewheel_action(1)

View File

@@ -672,7 +672,6 @@ ui/default_transition="curtain"
ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
ui/main_menu_scene="res://game/ui/commons/main_menu/main_menu.tscn"
ui/pause_menu_scene="res://game/ui/commons/pause_menu/pause_menu.tscn"
internals/save_data=""
[input]