From 31b57505b59008b0d013251dbbf7b94e9b0cdb89 Mon Sep 17 00:00:00 2001 From: Duncan Brown Date: Fri, 4 Feb 2022 17:10:23 -0500 Subject: [PATCH] fix: set a proper guard in case of no speaking animations and correct the upper limit check for the speaking index --- addons/escoria-core/game/core-scripts/esc_item.gd | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/escoria-core/game/core-scripts/esc_item.gd b/addons/escoria-core/game/core-scripts/esc_item.gd index e3f3f3ed..cca3a4f6 100644 --- a/addons/escoria-core/game/core-scripts/esc_item.gd +++ b/addons/escoria-core/game/core-scripts/esc_item.gd @@ -452,9 +452,11 @@ func turn_to(object: Node, wait: float = 0.0): # Play the talking animation func start_talking(): - if get_animation_player() and \ - _movable.last_dir >= 0 and \ - _movable.last_dir <= animations.speaks.size(): + # Only start the speaking animation if we actually have them setup + if animations.speaks.size() > 0 \ + and get_animation_player() \ + and _movable.last_dir >= 0 \ + and _movable.last_dir < animations.speaks.size(): if get_animation_player().is_playing(): get_animation_player().stop() get_animation_player().play(