Merge pull request #317 from tzachshabtay/WalkDuringSay

Walk during say caused fast sliding walking
tzachshabtay · May 7, 2019 · 9275f92 · 9275f92
2 parents 49feb71 + 7508b86
commit 9275f92
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Engine/AGS.Engine/Objects/Characters/Talking/AGSSayComponent.cs b/Source/Engine/AGS.Engine/Objects/Characters/Talking/AGSSayComponent.cs
@@ -107,7 +107,7 @@ public async Task SayAsync(string text, PointF? textPosition = null, PointF? por
             label.Dispose();
             if (portrait != null) portrait.Visible = false;
 
-            if (outfit != null)
+            if (outfit != null && _faceDirection?.CurrentDirectionalAnimation == speakAnimation) //if the animation is not speakAnimation, somebody switched the animations during speak (perhaps the character is now walking), so we shouldn't revert the animation to what it was before
             {
                 if (wasWalking && !walkComponent.IsWalking) previousAnimation = outfit.Outfit[AGSOutfit.Idle]; //If we were in the middle of a walk but walk was completed before speech, then instead of revert to the previous animation (walk) we need to go to idle.
                 await setAnimation(previousAnimation);
@@ -184,4 +184,4 @@ private ISayLocation getLocation(string text)
 			return _location.GetLocation(text, SpeechConfig);
 		}
 	}
-}
+}