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

fix a flaw in UnitAI trade management

Browse Source 
This was SVN commit r14868.
This commit is contained in:
mimo 2014-03-26 09:11:06 +00:00
parent 3dfa858229
commit d5ff29d181
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -2513,7 +2513,10 @@ var UnitFsmSpec = {
"MoveCompleted": function() {
if (this.waypoints && this.waypoints.length)
this.MoveToMarket(this.order.data.firstMarket);
{
if (!this.MoveToMarket(this.order.data.firstMarket))
this.stopTrading();
}
else
this.PerformTradeAndMoveToNextMarket(this.order.data.firstMarket, this.order.data.secondMarket, "APPROACHINGSECONDMARKET");
},
@ -2526,7 +2529,10 @@ var UnitFsmSpec = {
"MoveCompleted": function() {
if (this.waypoints && this.waypoints.length)
this.MoveToMarket(this.order.data.secondMarket);
{
if (!this.MoveToMarket(this.order.data.secondMarket))
this.stopTrading();
}
else
this.PerformTradeAndMoveToNextMarket(this.order.data.secondMarket, this.order.data.firstMarket, "APPROACHINGFIRSTMARKET");
},
@ -5064,13 +5070,6 @@ UnitAI.prototype.MoveToMarket = function(targetMarket)
var ok = this.MoveToTarget(targetMarket);
}
if (!ok)
{
// We can't reach the market. Give up.
this.StopMoving();
this.StopTrading();
}
return ok;
};
@ -5114,6 +5113,7 @@ UnitAI.prototype.PerformTradeAndMoveToNextMarket = function(currentMarket, nextM
UnitAI.prototype.StopTrading = function()
{
this.StopMoving();
this.FinishOrder();
var cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
cmpTrader.StopTrading();