Ticket #1963: fix-no-gain-for-unfinished-market.patch

File fix-no-gain-for-unfinished-market.patch, 1.6 KB (added by Markus, 11 years ago)
  • trunk/binaries/data/mods/public/gui/session/input.js

    a b  
    263263                (!hasClass(entState, "NavalMarket") || hasClass(targetState, "NavalMarket")))
    264264        {
    265265            // Find a trader (if any) that this building can produce.
    266             var trader;
     266            var trader = null;
    267267            if (entState.production && entState.production.entities.length)
    268268                for (var i = 0; i < entState.production.entities.length; ++i)
    269269                    if ((trader = GetTemplateData(entState.production.entities[i]).trader))
    270270                        break;
    271271
    272             var traderData = { "firstMarket": entState.id, "secondMarket": targetState.id, "template": trader };
    273             var gain = Engine.GuiInterfaceCall("GetTradingRouteGain", traderData);
    274             if (gain !== null)
     272            if (trader !== null)
    275273            {
    276                 data.command = "trade";
    277                 data.target = traderData.secondMarket;
    278                 data.source = traderData.firstMarket;
    279                 cursor = "action-setup-trade-route";
    280                 tooltip = "Click to establish a default route for new traders. Gain: " + gain + " metal.";
     274                var traderData = { "firstMarket": entState.id, "secondMarket": targetState.id, "template": trader };
     275                var gain = Engine.GuiInterfaceCall("GetTradingRouteGain", traderData);
     276                if (gain !== null)
     277                {
     278                    data.command = "trade";
     279                    data.target = traderData.secondMarket;
     280                    data.source = traderData.firstMarket;
     281                    cursor = "action-setup-trade-route";
     282                    tooltip = "Click to establish a default route for new traders. Gain: " + gain + " metal.";
     283                }
    281284            }
    282285        }
    283286