real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fix OOS problems caused by an unwanted modification of the simulation state by the GUI.

Browse Source 
Refs #1257

This was SVN commit r15511.
This commit is contained in:
Nicolas Auvray 2014-07-11 18:11:32 +00:00
parent a4e3422a22
commit f5cc99f78b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/simulation/components/RallyPoint.js
View File

@ -22,6 +22,11 @@ RallyPoint.prototype.GetPositions = function()
// Update positions for moving target entities
// TODO: If we target an enemy unit we should update its position
// as long as it is outside of FoW and SoD.
// We must not affect the simulation state here (modifications of the
// RallyPointRenderer are allowed though), so copy the state
var ret = this.pos;
for (var i = 0; i < this.pos.length; i++)
{
if (!this.data[i] || !this.data[i].target)
@ -39,13 +44,13 @@ RallyPoint.prototype.GetPositions = function()
if (this.pos[i].x == targetPosition.x && this.pos[i].z == targetPosition.y)
continue;
this.pos[i] = {"x": targetPosition.x, "z": targetPosition.y};
ret[i] = {"x": targetPosition.x, "z": targetPosition.y};
var cmpRallyPointRenderer = Engine.QueryInterface(this.entity, IID_RallyPointRenderer);
if (cmpRallyPointRenderer)
cmpRallyPointRenderer.UpdatePosition(i, targetPosition);
}
return this.pos;
return ret;
};
// Extra data for the rally point, should have a command property and then helpful data for that command