Index: ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js +++ ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js @@ -1506,7 +1506,7 @@ if (!this.MoveTo(this.order.data)) { this.FinishOrder(); - return; + return true; } this.SelectAnimation("move"); }, @@ -1526,7 +1526,7 @@ if (!this.MoveTo(this.order.data)) { this.FinishOrder(); - return; + return true; } // Show weapons rather than carried resources. this.SetAnimationVariant("combat"); @@ -1558,7 +1558,7 @@ !this.MoveTo(this.order.data)) { this.FinishOrder(); - return; + return true; } if (!this.patrolStartPosOrder) @@ -1604,7 +1604,7 @@ if (!this.MoveToTargetRangeExplicit(this.isGuardOf, 0, this.guardRange)) { this.FinishOrder(); - return; + return true; } // Show weapons rather than carried resources. @@ -1714,7 +1714,7 @@ !cmpUnitMotion || !cmpUnitMotion.MoveToTargetRange(this.order.data.target, distance, -1)) { this.FinishOrder(); - return; + return true; } this.PlaySound("panic"); @@ -1759,7 +1759,7 @@ if (!this.MoveToTargetAttackRange(this.order.data.target, this.order.data.attackType)) { this.FinishOrder(); - return; + return true; } // Show weapons rather than carried resources. @@ -1841,7 +1841,7 @@ if (this.MoveToTargetAttackRange(target, this.order.data.attackType)) { this.SetNextState("COMBAT.CHASING"); - return; + return true; } } } @@ -2017,7 +2017,7 @@ if (!this.MoveTo(this.order.data)) { this.FinishOrder(); - return; + return true; } // Show weapons rather than carried resources. @@ -2203,7 +2203,7 @@ if (!this.MoveTo(this.order.data)) { this.FinishOrder(); - return; + return true; } this.SelectAnimation("move"); }, @@ -2658,7 +2658,7 @@ if (!this.MoveToMarket(this.order.data.target)) { this.FinishOrder(); - return; + return true; } this.SelectAnimation("move"); }, Index: ps/trunk/source/simulation2/components/CCmpUnitMotion.cpp =================================================================== --- ps/trunk/source/simulation2/components/CCmpUnitMotion.cpp +++ ps/trunk/source/simulation2/components/CCmpUnitMotion.cpp @@ -1647,7 +1647,7 @@ // We're already in range - no need to move anywhere if (m_FacePointAfterMove) FaceTowardsPointFromPos(pos, goal.x, goal.z); - return false; + return true; } entity_pos_t goalDistance = maxRange - Pathfinding::GOAL_DELTA;