forked from 0ad/0ad
cleanup of some missing tabs
This was SVN commit r17817.
This commit is contained in:
parent
e99e7e33ba
commit
23d37f188a
@ -3,14 +3,14 @@ function DistanceBetweenEntities(first, second)
|
||||
var cmpFirstPosition = Engine.QueryInterface(first, IID_Position);
|
||||
if (!cmpFirstPosition || !cmpFirstPosition.IsInWorld())
|
||||
return Infinity;
|
||||
var firstPosition = cmpFirstPosition.GetPosition2D();
|
||||
|
||||
var cmpSecondPosition = Engine.QueryInterface(second, IID_Position);
|
||||
if (!cmpSecondPosition || !cmpSecondPosition.IsInWorld())
|
||||
return Infinity;
|
||||
var secondPosition = cmpSecondPosition.GetPosition2D();
|
||||
|
||||
return firstPosition.distanceTo(secondPosition);
|
||||
var firstPosition = cmpFirstPosition.GetPosition2D();
|
||||
var secondPosition = cmpSecondPosition.GetPosition2D();
|
||||
return firstPosition.distanceTo(secondPosition);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -19,27 +19,27 @@ function DistanceBetweenEntities(first, second)
|
||||
*/
|
||||
function SortEntitiesByPriority(ents)
|
||||
{
|
||||
// Priority list, weakers first
|
||||
var types = ["Structure", "Worker"];
|
||||
// Priority list, weakers first
|
||||
var types = ["Structure", "Worker"];
|
||||
|
||||
ents.sort(function (a, b) {
|
||||
var cmpIdentityA = Engine.QueryInterface(a, IID_Identity);
|
||||
var cmpIdentityB = Engine.QueryInterface(b, IID_Identity);
|
||||
if (!cmpIdentityA || !cmpIdentityB)
|
||||
return 0;
|
||||
var classesA = cmpIdentityA.GetClassesList();
|
||||
var classesB = cmpIdentityB.GetClassesList();
|
||||
for each (var type in types)
|
||||
{
|
||||
var inA = classesA.indexOf(type) != -1;
|
||||
var inB = classesB.indexOf(type) != -1;
|
||||
if (inA && !inB)
|
||||
return +1;
|
||||
if (inB && !inA)
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
ents.sort(function (a, b) {
|
||||
var cmpIdentityA = Engine.QueryInterface(a, IID_Identity);
|
||||
var cmpIdentityB = Engine.QueryInterface(b, IID_Identity);
|
||||
if (!cmpIdentityA || !cmpIdentityB)
|
||||
return 0;
|
||||
var classesA = cmpIdentityA.GetClassesList();
|
||||
var classesB = cmpIdentityB.GetClassesList();
|
||||
for (var type of types)
|
||||
{
|
||||
var inA = classesA.indexOf(type) != -1;
|
||||
var inB = classesB.indexOf(type) != -1;
|
||||
if (inA && !inB)
|
||||
return +1;
|
||||
if (inB && !inA)
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
||||
Engine.RegisterGlobal("DistanceBetweenEntities", DistanceBetweenEntities);
|
||||
|
Loading…
Reference in New Issue
Block a user