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

Check whether the attack/gather target is visible and if not abort. Fixes #1662 and #1753.

Browse source 
This was SVN commit r12975.
This commit is contained in:
leper 2012-12-10 23:35:09 +00:00
parent 03e10011ad
commit 6fd6295644
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

@ -649,8 +649,8 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, maxRange))
{
if (!this.TargetIsAlive(msg.data.target))
// The target was destroyed
if (!this.TargetIsAlive(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The target was destroyed or isn't visible any more.
this.FinishOrder();
else
// Out of range; move there in formation
@ -700,8 +700,8 @@ var UnitFsmSpec = {
// Check if we are already in range, otherwise walk there
if (!this.CheckTargetRangeExplicit(msg.data.target, 0, 10))
{
if (!this.CanGather(msg.data.target))
// The target isn't gatherable
if (!this.CanGather(msg.data.target) || !this.CheckTargetVisible(msg.data.target))
// The target isn't gatherable or not visible any more.
this.FinishOrder();
// TODO: Should we issue a gather-near-position order
// if the target isn't gatherable/doesn't exist anymore?
@ -851,7 +851,7 @@ var UnitFsmSpec = {
cmpFormation.Disband();
},
},
"FORMING": {
"MoveStarted": function(msg) {
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);