Fix crashes in rooms 9 and 13 (#415)
This commit is contained in:
@@ -27,7 +27,7 @@ func validate(arguments: Array):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
return false
|
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(
|
escoria.logger.report_errors(
|
||||||
"inc_global: invalid global",
|
"inc_global: invalid global",
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ func target_reached():
|
|||||||
func _process(_delta):
|
func _process(_delta):
|
||||||
zoom_transform = self.get_canvas_transform()
|
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
|
self.global_position = follow_target.global_position
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ func _enter_tree():
|
|||||||
## BACKGROUND ##
|
## BACKGROUND ##
|
||||||
|
|
||||||
func left_click_on_bg(position: Vector2) -> void:
|
func left_click_on_bg(position: Vector2) -> void:
|
||||||
|
if escoria.main.current_scene.player:
|
||||||
escoria.do(
|
escoria.do(
|
||||||
"walk",
|
"walk",
|
||||||
[escoria.main.current_scene.player.global_id, position],
|
[escoria.main.current_scene.player.global_id, position],
|
||||||
|
|||||||
@@ -672,7 +672,6 @@ ui/default_transition="curtain"
|
|||||||
ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
|
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/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"
|
ui/pause_menu_scene="res://game/ui/commons/pause_menu/pause_menu.tscn"
|
||||||
internals/save_data=""
|
|
||||||
|
|
||||||
[input]
|
[input]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user