wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Check for all cases. Really fix #1753.

Browse Source 
This was SVN commit r12976.
This commit is contained in:
leper 2012-12-10 23:55:16 +00:00
parent 6fd6295644
commit a3ca29138e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -671,7 +671,7 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there // Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10)) if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10))
{ {
if (!this.TargetIsAlive(msg.data.target)) if (!this.TargetIsAlive(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The target was destroyed // The target was destroyed
this.FinishOrder(); this.FinishOrder();
else else
@ -690,7 +690,7 @@ var UnitFsmSpec = {
}, },
"Order.Gather": function(msg) { "Order.Gather": function(msg) {
if (this.MustKillGatherTarget(msg.data.target)) if (this.MustKillGatherTarget(msg.data.target) && this.CheckTargetVisible(msg.data.target))
{ {
this.PushOrderFront("Attack", { "target": msg.data.target, "hunting": true }); this.PushOrderFront("Attack", { "target": msg.data.target, "hunting": true });
return; return;
@ -744,7 +744,7 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there // Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10)) if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10))
{ {
if (!this.TargetIsAlive(msg.data.target)) if (!this.TargetIsAlive(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The target was destroyed // The target was destroyed
this.FinishOrder(); this.FinishOrder();
else else
@ -767,7 +767,7 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there // Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10)) if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10))
{ {
if (!this.TargetIsAlive(msg.data.target)) if (!this.TargetIsAlive(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The building was finished or destroyed // The building was finished or destroyed
this.FinishOrder(); this.FinishOrder();
else else
@ -790,7 +790,7 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there // Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10)) if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10))
{ {
if (!this.TargetIsAlive(msg.data.target)) if (!this.TargetIsAlive(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The target was destroyed // The target was destroyed
this.FinishOrder(); this.FinishOrder();
else else