Ticket #1260: UnitAI.js.patch

UnitAI.js

@@ -960 +960 @@
         },
 
         "GATHER": {
-            "APPROACHING": {
-                "enter": function() {
-                    this.SelectAnimation("move");
-                },
+      "APPROACHING": {
+        "enter": function() {
+          // Check if we are already carry something. If so we need to show
+          // the appropriate animation.
+          var cmpResourceGatherer = Engine.QueryInterface(this.entity, IID_ResourceGatherer);
+          var type = cmpResourceGatherer.GetLastCarriedType();
+          if (type)
+          {
+            var animation = "carry_" + type.generic;
+            // Special case for meat
+            if (type.specific == "meat")
+              animation = "carry_" + type.specific;
 
+            this.SelectAnimation(animation, false, this.GetWalkSpeed());
+            return;
+          }
+
+          this.SelectAnimation("move");
+        },
+
                 "MoveCompleted": function(msg) {
                     if (msg.data.error)
                     {