Ticket #1843: retarget.diff

binaries/data/mods/public/simulation/components/Promotion.js

@@ -78 +78 @@
     cmpPromotedUnitAI.Cheer();
     var orders = cmpCurrentUnitAI.GetOrders();
     cmpPromotedUnitAI.AddOrders(orders);
+    // if any orders were targeted to the current unit, retarget them to the promoted one
+    cmpCurrentUnitAI.RetargetOrders(promotedUnitEntity);
 
     Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: promotedUnitEntity });
 

binaries/data/mods/public/simulation/components/Pack.js

@@ -162 +162 @@
             if (cmpUnitAI.GetStanceName())
                 cmpNewUnitAI.SwitchToStance(cmpUnitAI.GetStanceName());
             cmpNewUnitAI.AddOrders(cmpUnitAI.GetOrders());
+            // if any orders were targeted to this unit, retarget them to the new one
+            cmpUnitAI.RetargetOrders(newEntity);
         }
 
         Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: newEntity });

binaries/data/mods/public/simulation/components/UnitAI.js

@@ -2701 +2701 @@
     return orders;
 };
 
+UnitAI.prototype.RetargetOrders = function(newEntity)
+{
+    // We try to retarget orders from this.entity to the new entity
+    for each (var ent in Engine.GetEntitiesWithInterface(IID_UnitAI))
+    {
+        var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+        for (i in cmpUnitAI.orderQueue)
+        {
+            if (cmpUnitAI.orderQueue[i].data && cmpUnitAI.orderQueue[i].data.target)
+            {
+                if (cmpUnitAI.orderQueue[i].data.target == this.entity)
+                    cmpUnitAI.orderQueue[i].data.target = newEntity;
+            }
+        }
+    }
+};
+
 UnitAI.prototype.TimerHandler = function(data, lateness)
 {
     // Reset the timer