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

Fixed rally point lines being displayed for entities with rally points no longer set. Closes #1043.

Browse Source 
This was SVN commit r10743.
This commit is contained in:
vts 2011-12-16 15:14:59 +00:00
parent 78d50b4149
commit e62b9b6d8f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binaries/data/mods/public/simulation/components/GuiInterface.js
View File

@ -442,7 +442,9 @@ GuiInterface.prototype.DisplayRallyPoint = function(player, cmd)
if (cmpRallyPointRenderer)
cmpRallyPointRenderer.SetDisplayed(false);
}
this.entsRallyPointsDisplayed = [];
// Show the rally points for the passed entities
for each (var ent in cmd.entities)
{
@ -468,16 +470,17 @@ GuiInterface.prototype.DisplayRallyPoint = function(player, cmd)
if (cmd.x && cmd.z)
pos = cmd;
else
pos = cmpRallyPoint.GetPosition(); // may return undefined
pos = cmpRallyPoint.GetPosition(); // may return undefined if no rally point is set
if (pos)
{
cmpRallyPointRenderer.SetPosition({'x': pos.x, 'y': pos.z}); // SetPosition takes a CFixedVector2D which has X/Y components, not X/Z
cmpRallyPointRenderer.SetDisplayed(true);
cmpRallyPointRenderer.SetDisplayed(true);
// remember which entities have their rally points displayed so we can hide them again
this.entsRallyPointsDisplayed.push(ent);
}
}
// Remember which entities have their rally points displayed so we can hide them again
this.entsRallyPointsDisplayed = cmd.entities;
};
/**