abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove a warning about missing markets when the player has issued a barter command just before losing the market, fixes #3645.

Browse Source 
This was SVN commit r21733.
This commit is contained in:
elexis 2018-04-16 01:04:53 +00:00
parent 35b0715c3a
commit a00b4b6e77
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/simulation/components/Barter.js
View File

@ -63,28 +63,29 @@ Barter.prototype.PlayerHasMarket = function(playerID)
Barter.prototype.ExchangeResources = function(playerID, resourceToSell, resourceToBuy, amount)
{
// Data verification
if (amount <= 0)
{
warn("ExchangeResources: incorrect amount: " + uneval(amount));
return;
}
let availResources = Resources.GetCodes();
if (availResources.indexOf(resourceToSell) == -1)
{
warn("ExchangeResources: incorrect resource to sell: " + uneval(resourceToSell));
return;
}
if (availResources.indexOf(resourceToBuy) == -1)
{
warn("ExchangeResources: incorrect resource to buy: " + uneval(resourceToBuy));
return;
}
// This can occur when the player issues the order just before the market is destroyed or captured
if (!this.PlayerHasMarket(playerID))
{
warn("ExchangeResources: player has no markets");
return;
}
if (amount != 100 && amount != 500)
return;