Ticket #3745: backtowork.2.patch

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

@@ -192 +192 @@
     {
         return 6;
     },
-    "getItems": function(unitEntState)
+    "getItems": function(unitEntState, selection)
     {
-        var commands = [];
-        for (var c in g_EntityCommands)
+        let commands = [];
+
+        for (let c in g_EntityCommands)
         {
             var info = g_EntityCommands[c].getInfo(unitEntState);
             if (!info)
                 continue;
+
             info.name = c;
             commands.push(info);
         }
+
+        // if the given unit state has no back-to-work entry, we need to check the other units as well
+        // otherwise the command back-to-work is not shown
+        if (!commands["back-to-work"]) {
+            for (let id of selection) {
+                let uEntState = GetExtendedEntityState(id);
+                
+                let info = g_EntityCommands["back-to-work"].getInfo(uEntState);
+                if (!info)
+                    continue;
+                    
+                info.name = "back-to-work";
+                commands.push(info);
+                break;
+            }
+        }
+
         return commands;
     },
     "setTooltip": function(data)

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

@@ -28 +28 @@
  * (i.e. panels with rows of icons) for the currently selected unit.
  *
  * @param guiName Short identifier string of this panel. See g_SelectionPanels.
- * @param unitEntState Entity state of the (first) selected unit.
+ * @param unitEntState Entity state of the selected unit with the lowest id.
  * @param payerState Player state
+ * @param selectedEntries All selected units
  */
-function setupUnitPanel(guiName, unitEntState, playerState)
+function setupUnitPanel(guiName, unitEntState, playerState, selection)
 {
     if (!g_SelectionPanels[guiName])
     {
@@ -38 +39 @@
         error("unknown guiName used '" + guiName + "'");
         return;
     }
-    var selection = g_Selection.toList();
-
     var items = g_SelectionPanels[guiName].getItems(unitEntState, selection);
 
     if (!items || !items.length)
@@ -146 +145 @@
  * Delegates to setupUnitPanel to set up individual subpanels,
  * appropriately activated depending on the selected unit's state.
  *
- * @param entState Entity state of the (first) selected unit.
+ * @param entState Entity state of the selected unit with the lowest id
  * @param supplementalDetailsPanel Reference to the
  *        "supplementalSelectionDetails" GUI Object
  * @param commandsPanel Reference to the "commandsPanel" GUI Object
@@ -175 +174 @@
             )
                 continue;
 
-            setupUnitPanel(guiName, entState, simState.players[entState.player]);
+            setupUnitPanel(guiName, entState, simState.players[entState.player], selection);
         }
 
         supplementalDetailsPanel.hidden = false;
@@ -185 +184 @@
     {
         // 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;