mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-29 03:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't always call FinishOrder when leaving a formation, as they may be in the idle state.

Browse Source 
This was SVN commit r12548.
This commit is contained in:
Deiz
2012-08-29 19:54:29 +00:00
parent eea0a62b64
commit 781ad7d520
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/UnitAI.js
+8 -3
View File
@@ -622,9 +622,14 @@ var UnitFsmSpec = {
// Stop moving as soon as the formation disbands
this.StopMoving();
// We're leaving the formation, so stop our FormationWalk order
if (this.FinishOrder())
return;
// If the controller handled an order but some members rejected it,
// they will have no orders and be in the FORMATIONMEMBER.IDLE state.
if (this.orderQueue.length)
{
// We're leaving the formation, so stop our FormationWalk order
if (this.FinishOrder())
return;
}
// No orders left, we're an individual now
if (this.IsAnimal())