Merge pull request #5630 from pavlos256/map-helpers

Move map helpers from WorldUtils to Map
This commit is contained in:
Matthias Mailänder
2014-06-14 11:49:19 +02:00
33 changed files with 162 additions and 149 deletions

View File

@@ -171,7 +171,7 @@ namespace OpenRA.Mods.RA.Air
if (self.World.ActorMap.AnyUnitsAt(cell))
return false;
var type = self.World.GetTerrainInfo(cell).Type;
var type = self.World.Map.GetTerrainInfo(cell).Type;
return info.LandableTerrainTypes.Contains(type);
}

View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Air
if (order.OrderString == "Move")
{
var cell = self.World.ClampToWorld(order.TargetLocation);
var cell = self.World.Map.Clamp(order.TargetLocation);
var t = Target.FromCell(cell);
self.SetTargetLine(t, Color.Green);

View File

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA.Air
{
UnReserve();
var cell = self.World.ClampToWorld(order.TargetLocation);
var cell = self.World.Map.Clamp(order.TargetLocation);
var t = Target.FromCell(cell);
self.SetTargetLine(t, Color.Green);
self.CancelActivity();