Ticket #1209: unit_commands.js.patch

unit_commands.js

@@ -394 +394 @@
 }
 
 // Sets up "unit trading panel" - special case for setupUnitPanel
-function setupUnitTradingPanel(unitEntState)
+function setupUnitTradingPanel(unitEntState, selection)
 {
     for (var i = 0; i < TRADING_RESOURCES.length; i++)
     {
         var resource = TRADING_RESOURCES[i];
         var button = getGUIObjectByName("unitTradingButton["+i+"]");
         button.size = (i * 46) + " 0 " + ((i + 1) * 46) + " 46";
-        var selectTradingPreferredGoodsData = { "trader": unitEntState.id, "preferredGoods": resource };
+        var selectTradingPreferredGoodsData = { "entities": selection, "preferredGoods": resource };
         button.onpress = (function(e){ return function() { selectTradingPreferredGoods(e); } })(selectTradingPreferredGoodsData);
         button.enabled = true;
         button.tooltip = "Set " + resource + " as trading goods";
@@ -543 +543 @@
         if (entState.training && entState.training.entities.length)
         {
             setupUnitPanel("Training", usedPanels, entState, entState.training.entities,
-                function (trainEntType) { addToTrainingQueue(entState.id, trainEntType); } );
+                function (trainEntType) { addToTrainingQueue(entState.id, trainEntType, selection); } );
 //          isInvisible = false;
         }
 
@@ -554 +554 @@
         if (entState.trader)
         {
             usedPanels["Trading"] = 1;
-            setupUnitTradingPanel(entState);
+            setupUnitTradingPanel(entState, selection);
         }
 
 //      supplementalDetailsPanel.hidden = false;