Ticket #2179: moveFormation.diff

binaries/data/mods/public/gui/session/unit_commands.js

@@ -38 +38 @@
 // Indexes of resources to sell and buy on barter panel
 var g_barterSell = 0;
 
+// Cache a few quantities which depend on selection
+var g_canMoveIntoFormation = {};
+
 // Lay out a row of centered buttons (does not work inside a loop like the other function)
 function layoutButtonRowCentered(rowNumber, guiName, startIndex, endIndex, width)
 {
@@ -572 +575 @@
         // Get icon image
         if (guiName == FORMATION)
         {
-            var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
-                "ents": g_Selection.toList(),
-                "formationName": item
-            });
-
+            var formationOk = canMoveEntsIntoFormation(item);
             var grayscale = "";
             button.enabled = formationOk;
             if (!formationOk)
@@ -1288 +1287 @@
     removeDupes(buildableEnts);
     return buildableEnts;
 }
+
+// Check if the selection can move into formation, and cache the result
+function canMoveEntsIntoFormation(formationName)
+{
+    if (!(formationName in g_canMoveIntoFormation))
+    {
+        g_canMoveIntoFormation[formationName] = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
+            "ents": g_Selection.toList(),
+            "formationName": formationName
+        });
+    }
+    return g_canMoveIntoFormation[formationName];
+}
+
+// Reset cached quantities which depend on selection
+function onSelectionChanged()
+{
+    g_canMoveIntoFormation = {};
+}
+ Pas de retour chariot à la fin du fichier

binaries/data/mods/public/gui/session/session.js

@@ -312 +312 @@
     // simulation state and the current selection).
     if (g_Selection.dirty)
     {
+        // reset cached quantities which depend on selection (in unit_commands.js) 
+        onSelectionChanged();
+
         onSimulationUpdate();
 
         // Display rally points for selected buildings

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

@@ -1280 +1280 @@
     formationName = formationName.replace(/\s+/g,"");
 
     var count = 0;
+    if (requirements.count == 0)
+        return true;
     var reqClasses = requirements.classesRequired || [];
     for each (var ent in ents)
     {
@@ -1292 +1294 @@
             return false;
 
         count++;
+        if (count == requirements.count)
+            return true;
     }
 
-    if (count < requirements.count)
-        return false;
-
-    return true;
+    return false;
 }
 
 /**