dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 21:34:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix incoherent UnitAI state when changing ownership of a cheering or garrisoned unit

Browse source 
This was SVN commit r16908.
This commit is contained in:
mimo 2015-08-02 09:39:08 +00:00
parent 591771a0be
commit b3f7b8633a
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
binaries/data/mods/public/simulation/components/UnitAI.js
View file

@ -3287,20 +3287,26 @@ UnitAI.prototype.OnOwnershipChanged = function(msg)
{
this.SetupRangeQueries();
// If the unit isn't being created or dying, reset stance and clear orders (if not garrisoned).
// If the unit isn't being created or dying, reset stance and clear orders
if (msg.to != -1 && msg.from != -1)
{
// Switch to a virgin state to let states execute their leave handlers.
var index = this.GetCurrentState().indexOf(".");
if (index != -1)
this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index));
// except if garrisoned or cheering, in which case we only clear the order queue
if (this.isGarrisoned || (this.orderQueue[0] && this.orderQueue[0].type == "Cheering"))
this.orderQueue.length = Math.min(this.orderQueue.length, 1);
else
{
let index = this.GetCurrentState().indexOf(".");
if (index != -1)
this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index));
this.Stop(false);
}
this.SetStance(this.template.DefaultStance);
if(!this.isGarrisoned)
this.Stop(false);
if (this.IsTurret())
this.SetTurretStance();
}
};
UnitAI.prototype.OnDestroy = function()
{
// Switch to an empty state to let states execute their leave handlers.