Ticket #3823: 3823.patch

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

@@ -192 +192 @@
     {
         return 6;
     },
-    "getItems": function(unitEntState)
+    "getItems": function(unitEntStateUNUSED, selection)
     {
         let commands = [];
 
-        for (let c in g_EntityCommands)
+        for (let cmd in g_EntityCommands)
         {
-            var info = g_EntityCommands[c].getInfo(unitEntState);
-            if (!info)
-                continue;
+            for (let id of selection) 
+            {
+                let unitEntState = GetEntityState(id); 
 
-            info.name = c;
-            commands.push(info);
+                var info = g_EntityCommands[cmd].getInfo(unitEntState);
+                if (!info)
+                    continue;
+
+                info.name = cmd;
+                commands.push(info);
+                break; // add each command only once
+            }
         }
         return commands;
     },

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

@@ -31 +31 @@
  * @param unitEntState Entity state of the selected unit with the lowest id.
  * @param payerState Player state
  */
-function setupUnitPanel(guiName, unitEntState, playerState)
+function setupUnitPanel(guiName, unitEntState, playerState, selection)
 {
     if (!g_SelectionPanels[guiName])
     {
@@ -38 +38 @@
         error("unknown guiName used '" + guiName + "'");
         return;
     }
-    let selection = g_Selection.toList();
 
     var items = g_SelectionPanels[guiName].getItems(unitEntState, selection);
 
@@ -174 +173 @@
             )
                 continue;
 
-            setupUnitPanel(guiName, entState, playerStates[entState.player]);
+            setupUnitPanel(guiName, entState, playerStates[entState.player], selection);
         }
 
         supplementalDetailsPanel.hidden = false;
@@ -184 +183 @@
     {
         // TODO if there's a second panel needed for a different player
         // we should consider adding the players list to g_SelectionPanels
-        setupUnitPanel("Garrison", entState, playerState);
-        setupUnitPanel("AllyCommand", entState, playerState);
+        setupUnitPanel("Garrison", entState, playerState, selection);
+        setupUnitPanel("AllyCommand", entState, playerState, selection);
 
         supplementalDetailsPanel.hidden = !g_SelectionPanels.Garrison.used;