real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

complete b3f7b8633a for (un)packing

Browse Source 
This was SVN commit r16910.
This commit is contained in:
mimo 2015-08-02 17:24:04 +00:00
parent ec96c737ee
commit 3c8fe51712
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3291,8 +3291,9 @@ UnitAI.prototype.OnOwnershipChanged = function(msg)
if (msg.to != -1 && msg.from != -1) if (msg.to != -1 && msg.from != -1)
{ {
// Switch to a virgin state to let states execute their leave handlers. // Switch to a virgin state to let states execute their leave handlers.
// except if garrisoned or cheering, in which case we only clear the order queue // except if garrisoned or cheering or (un)packing, in which case we only clear the order queue
if (this.isGarrisoned || (this.orderQueue[0] && this.orderQueue[0].type == "Cheering")) if (this.isGarrisoned || (this.orderQueue[0] && (this.orderQueue[0].type == "Cheering"
|| this.orderQueue[0].type == "Pack" || this.orderQueue[0].type == "Unpack")))
this.orderQueue.length = Math.min(this.orderQueue.length, 1); this.orderQueue.length = Math.min(this.orderQueue.length, 1);
else else
{ {
@ -3304,9 +3305,10 @@ UnitAI.prototype.OnOwnershipChanged = function(msg)
this.SetStance(this.template.DefaultStance); this.SetStance(this.template.DefaultStance);
if (this.IsTurret()) if (this.IsTurret())
this.SetTurretStance(); this.SetTurretStance();
} }
}; };
UnitAI.prototype.OnDestroy = function() UnitAI.prototype.OnDestroy = function()
{ {
// Switch to an empty state to let states execute their leave handlers. // Switch to an empty state to let states execute their leave handlers.