Ticket #1255: #1255-2012-03-28.patch

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -445 +445 @@
 {
     var entities = []; // subset of ents that have UnitAI
     var members = {}; // { formationentity: [ent, ent, ...], ... }
+    var noFormation = false;
     for each (var ent in ents)
     {
         var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
@@ -455 +456 @@
                 members[fid] = [];
             members[fid].push(ent);
         }
+        else 
+        {
+            noFormation = true;
+        }
         entities.push(ent);
     }
 
     var ids = [ id for (id in members) ];
+    // If we encountered a unit that isn't part of a formation we add it to ids
+    // to prevent bug #1255.
+    if (noFormation)
+        ids.push(null);
 
     return { "entities": entities, "members": members, "ids": ids };
 }
@@ -533 +542 @@
     if (formation.ids.length == 1)
     {
         // Selected units all belong to the same formation.
-        // Check that it doesn't have any other members
+        // Check that we have all its members
         var fid = formation.ids[0];
         var cmpFormation = Engine.QueryInterface(+fid, IID_Formation);
         if (cmpFormation && cmpFormation.GetMemberCount() == formation.entities.length)