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

Summon planes back from the emptyness

Browse Source 
This was SVN commit r14230.
This commit is contained in:
sanderd17 2013-11-26 15:12:16 +00:00
parent 433b32bdcd
commit 7345d27c84
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
binaries/data/mods/public/simulation/components/UnitMotionFlying.js
View File

@ -92,12 +92,37 @@ UnitMotionFlying.prototype.OnUpdate = function(msg)
{
if (this.waterDeath)
cmpHealth.Kill();
this.pitch = 0;
// We've stopped.
cmpGarrisonHolder.AllowGarrisoning(true,"UnitMotionFlying")
canTurn = false;
this.hasTarget = false;
this.landing = false;
else
{
this.pitch = 0;
// We've stopped.
cmpGarrisonHolder.AllowGarrisoning(true,"UnitMotionFlying")
canTurn = false;
this.hasTarget = false;
this.landing = false;
// summon planes back from the edge of the map
var terrainSize = cmpTerrain.GetTilesPerSide() * 4;
var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
if (cmpRangeManager.GetLosCircular())
{
var mapRadius = terrainSize/2;
var x = pos.x - mapRadius;
var z = pos.z - mapRadius;
var div = (mapRadius - 12) / Math.sqrt(x*x + z*z);
if (div < 1)
{
pos.x = mapRadius + x*div;
pos.z = mapRadius + z*div;
newangle += Math.PI;
}
}
else
{
pos.x = Math.max(Math.min(pos.x, terrainSize - 12), 12);
pos.z = Math.max(Math.min(pos.z, terrainSize - 12), 12);
newangle += Math.PI;
}
}
}
else
{

1
source/simulation2/components/ICmpTerrain.cpp
View File

@ -24,4 +24,5 @@
BEGIN_INTERFACE_WRAPPER(Terrain)
DEFINE_INTERFACE_METHOD_2("GetGroundLevel", entity_pos_t, ICmpTerrain, GetGroundLevel, entity_pos_t, entity_pos_t)
DEFINE_INTERFACE_METHOD_2("CalcNormal", CFixedVector3D, ICmpTerrain, CalcNormal, entity_pos_t, entity_pos_t)
DEFINE_INTERFACE_METHOD_0("GetTilesPerSide", u16, ICmpTerrain, GetTilesPerSide)
END_INTERFACE_WRAPPER(Terrain)