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

Triage #2285. Not the most efficiant, but it works.

Browse Source 
This was SVN commit r14254.
This commit is contained in:
JoshuaJB 2013-11-29 17:46:24 +00:00
parent 25b92ec652
commit 860875c835
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binaries/data/mods/public/simulation/helpers/Damage.js
View File

@ -96,11 +96,11 @@ Damage.EntitiesNearPoint = function(origin, radius, players)
// If there is insufficient data return an empty array.
if (!origin || !radius)
return [];
// Create the dummy entity used for range calculations if it doesn't exist.
if (!Damage.dummyTargetEntity)
Damage.dummyTargetEntity = Engine.AddEntity('special/dummy');
// Create the dummy entity used for range calculations.
// TODO: Figure out a way to not constantly have to create/delete entities for these calculations.
var dummyTargetEntity = Engine.AddEntity('special/dummy');
// Move the dummy entity to the origin of the query.
var cmpDummyPosition = Engine.QueryInterface(Damage.dummyTargetEntity, IID_Position);
var cmpDummyPosition = Engine.QueryInterface(dummyTargetEntity, IID_Position);
if (!cmpDummyPosition)
return [];
cmpDummyPosition.JumpTo(origin.x, origin.z);
@ -116,7 +116,10 @@ Damage.EntitiesNearPoint = function(origin, radius, players)
// Call RangeManager with dummy entity and return the result.
var rangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var rangeQuery = rangeManager.ExecuteQuery(Damage.dummyTargetEntity, 0, radius, players, IID_DamageReceiver);
var rangeQuery = rangeManager.ExecuteQuery(dummyTargetEntity, 0, radius, players, IID_DamageReceiver);
// Delete the temperary entity used for range calculations.
Engine.DestroyEntity(dummyTargetEntity);
return rangeQuery;
};