Ticket #1206: #1206-2012-03-18.patch

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

@@ -1403 +1403 @@
     resetIdleUnit();
 }
 
-function unload(garrisonHolder, entity)
+function unload(garrisonHolder, entities)
 {
-    Engine.PostNetworkCommand({"type": "unload", "entity": entity, "garrisonHolder": garrisonHolder});
+    // We just remove the first unit if session.batchtrain isn't pressed
+    if (Engine.HotkeyIsPressed("session.batchtrain"))
+        Engine.PostNetworkCommand({"type": "unload", "entities": entities, "garrisonHolder": garrisonHolder});
+    else
+        Engine.PostNetworkCommand({"type": "unload", "entities": [entities[0]], "garrisonHolder": garrisonHolder});
 }
 
 function unloadAll(garrisonHolder)

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

@@ -226 +226 @@
 
             case GARRISON:
                 var name = getEntityName(template);
-                var tooltip = "Unload " + getEntityName(template);
+                var tooltip = "Unload " + getEntityName(template) + "\nSingle-click to unload 1. Shift-click to unload all of this type";
                 var count = garrisonGroups.getCount(item);
                 getGUIObjectByName("unit"+guiName+"Count["+i+"]").caption = (count > 1 ? count : "");
                 break;
@@ -508 +508 @@
             var groups = new EntityGroups();
             groups.add(entState.garrisonHolder.entities);
             setupUnitPanel("Garrison", usedPanels, entState, groups.getTemplateNames(),
-                function (item) { unload(entState.id, groups.getEntsByName(item)[0]); } );
+                function (item) { unload(entState.id, groups.getEntsByName(item)); } );
         }
 
         var formations = getEntityFormationsList(entState);

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

@@ -337 +337 @@
         if (CanControlUnit(cmd.garrisonHolder, player, controlAllUnits))
         {
             var cmpGarrisonHolder = Engine.QueryInterface(cmd.garrisonHolder, IID_GarrisonHolder);
-            if (!cmpGarrisonHolder || !cmpGarrisonHolder.Unload(cmd.entity))
+            for each (ent in cmd.entities)
             {
-                var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
-                var notification = {"player": cmpPlayer.GetPlayerID(), "message": "Unable to ungarrison unit"};
-                var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
-                cmpGUIInterface.PushNotification(notification);
-            }   
+                if (!cmpGarrisonHolder || !cmpGarrisonHolder.Unload(ent))
+                {
+                    var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
+                    var notification = {"player": cmpPlayer.GetPlayerID(), "message": "Unable to ungarrison unit"};
+                    var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+                    cmpGUIInterface.PushNotification(notification);
+                }
+            }
         }
         else if (g_DebugCommands)
         {