dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let states execute their leave handlers on OnDestroy. Fixes #1999. Patch by mimo.

Browse source 
This was SVN commit r13501.
This commit is contained in:
leper 2013-06-25 21:49:54 +00:00
parent 49b3b0ee9a
commit 2fcd52b657
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2564,18 +2564,9 @@ UnitAI.prototype.OnOwnershipChanged = function(msg)
UnitAI.prototype.OnDestroy = function()
{
// Clean up any timers that are now obsolete
this.StopTimer();
// Switch to an empty state to let states execute their leave handlers.
UnitFsm.SwitchToNextState(this, "");
// clear up the ResourceSupply gatherer count.
if (this.gatheringTarget)
{
var cmpSupply = Engine.QueryInterface(this.gatheringTarget, IID_ResourceSupply);
if (cmpSupply)
cmpSupply.RemoveGatherer(this.entity);
delete this.gatheringTarget;
}
// Clean up range queries
var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
if (this.losRangeQuery)

2
binaries/data/mods/public/simulation/helpers/FSM.js
View file

@ -350,7 +350,7 @@ FSM.prototype.SwitchToNextState = function(obj, nextStateName)
}
// Check if we should exit and enter the current state due to the reenter parameter. If so we go up 1 level
if (obj.fsmReenter && equalPrefix === toState.length)
if (obj.fsmReenter && equalPrefix > 0 && equalPrefix === toState.length)
--equalPrefix;
for (var i = fromState.length-1; i >= equalPrefix; --i)