fix: set a proper guard in case of no speaking animations (#488)

+ correct the upper limit check for the speaking index Co-authored-by: Duncan Brown <[email protected]>
godot-escoria · Feb 6, 2022 · 326618d · 326618d
1 parent 6f346a9
commit 326618d
Showing 1 changed file with 9 additions and 6 deletions.
diff --git 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(
@@ -464,9 +466,10 @@ func start_talking():
 
 # Stop playing the talking animation
 func stop_talking():
-	if get_animation_player() and \
-			_movable.last_dir >= 0 and \
-			_movable.last_dir <= animations.idles.size():
+	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(