oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #496 from godot-escoria/issue-98

Browse Source 
fix: guard for cases where no animations are set.
This commit is contained in:
Duncan Brown
2022-02-16 11:51:33 -05:00
committed by GitHub
parent 6d87c20169 d41f647a11
commit c676ce5a55
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -453,7 +453,8 @@ func turn_to(object: Node, wait: float = 0.0):
# Play the talking animation
func start_talking():
# Only start the speaking animation if we actually have them setup
if animations.speaks.size() > 0 \
if animations.speaks != null \
and animations.speaks.size() > 0 \
and get_animation_player() \
and _movable.last_dir >= 0 \
and _movable.last_dir < animations.speaks.size():
@@ -466,7 +467,8 @@ func start_talking():
# Stop playing the talking animation
func stop_talking():
if animations.speaks.size() > 0 \
if animations.speaks != null \
and animations.speaks.size() > 0 \
and get_animation_player() \
and _movable.last_dir >= 0 \
and _movable.last_dir < animations.speaks.size():