Ticket #1209: ticket-1209-1.patch

gui/session/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 selectionUnitIDs = new Array(0);
+        for (var j = 0; j < selection.length; ++j)
+        {
+            selectionUnitIDs.push (GetEntityState(selection[j]).id);
+        }
+        var selectTradingPreferredGoodsData = { "trader": selectionUnitIDs, "preferredGoods": resource };
         button.onpress = (function(e){ return function() { selectTradingPreferredGoods(e); } })(selectTradingPreferredGoodsData);
         button.enabled = true;
         button.tooltip = "Set " + resource + " as trading goods";
@@ -554 +559 @@
         if (entState.trader)
         {
             usedPanels["Trading"] = 1;
-            setupUnitTradingPanel(entState);
+            setupUnitTradingPanel(entState, selection);
         }
 
 //      supplementalDetailsPanel.hidden = false;

simulation/helpers/Commands.js

@@ -414 +414 @@
         break;
 
     case "select-trading-goods":
-        var cmpTrader = Engine.QueryInterface(cmd.trader, IID_Trader);
-        if (cmpTrader)
-            cmpTrader.SetPreferredGoods(cmd.preferredGoods);
+        for each (var ent in cmd.trader)
+        {
+            var cmpTrader = Engine.QueryInterface(ent, IID_Trader);
+            if (cmpTrader)
+                cmpTrader.SetPreferredGoods(cmd.preferredGoods);
+        }
         break;
-
+        
     case "barter":
         var cmpBarter = Engine.QueryInterface(SYSTEM_ENTITY, IID_Barter);
         cmpBarter.ExchangeResources(playerEnt, cmd.sell, cmd.buy, cmd.amount);