Ticket #3444: UnitAI.diff

UnitAI.js

@@ -1699 +1699 @@
                     this.SetGathererAnimationOverride(true);
 
                     this.SelectAnimation("move");
+                    if (this.IsAnimal())
+                        this.SetMoveSpeed(this.GetRunSpeed());
+
                     this.StartTimer(1000, 1000);
                 },
 
+                "HealthChanged": function() {
+                    if (this.IsAnimal())
+                        this.SetMoveSpeed(this.GetRunSpeed());
+                },
+
                 "leave": function() {
                     // Show carried resources when walking.
                     this.SetGathererAnimationOverride();
 
+                    this.SetMoveSpeed(this.GetWalkSpeed());
+
                     this.StopTimer();
                 },
 
@@ -1985 +1995 @@
 
                     this.SelectAnimation("move");
                     var cmpUnitAI = Engine.QueryInterface(this.order.data.target, IID_UnitAI);
-                    if (cmpUnitAI && cmpUnitAI.IsFleeing())
-                    {
-                        // Run after a fleeing target
-                        var speed = this.GetRunSpeed();
-                        this.SetMoveSpeed(speed);
-                    }
+                    if (cmpUnitAI && cmpUnitAI.IsFleeing() || this.IsAnimal())
+                        this.SetMoveSpeed(this.GetRunSpeed());
+
                     this.StartTimer(1000, 1000);
                 },
 
@@ -1998 +2005 @@
                     var cmpUnitAI = Engine.QueryInterface(this.order.data.target, IID_UnitAI);
                     if (!cmpUnitAI || !cmpUnitAI.IsFleeing())
                         return;
-                    var speed = this.GetRunSpeed();
-                    this.SetMoveSpeed(speed);
+                    if (this.IsAnimal())
+                        this.SetMoveSpeed(this.GetRunSpeed());
                 },
 
                 "leave": function() {