epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ClampToWorld from WorldUtils to Map

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-06-13 13:59:40 +03:00
parent c282fa1077
commit 77fb188585
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Map/Map.cs
View File

@@ -550,5 +550,11 @@ namespace OpenRA
var tileSet = Rules.TileSets[Tileset]; var tileSet = Rules.TileSets[Tileset];
return tileSet[GetTerrainIndex(cell)]; return tileSet[GetTerrainIndex(cell)];
} }
public CPos Clamp(CPos xy)
{
var r = Bounds;
return xy.Clamp(new Rectangle(r.X, r.Y, r.Width - 1, r.Height - 1));
}
} }
} }

6
OpenRA.Game/WorldUtils.cs
View File

@@ -88,12 +88,6 @@ namespace OpenRA
public const int MaxRange = 50; public const int MaxRange = 50;
static List<CVec>[] TilesByDistance = InitTilesByDistance(MaxRange); static List<CVec>[] TilesByDistance = InitTilesByDistance(MaxRange);
public static CPos ClampToWorld(this World world, CPos xy)
{
var r = world.Map.Bounds;
return xy.Clamp(new Rectangle(r.X,r.Y,r.Width-1, r.Height-1));
}
public static CPos ChooseRandomEdgeCell(this World w) public static CPos ChooseRandomEdgeCell(this World w)
{ {
var isX = w.SharedRandom.Next(2) == 0; var isX = w.SharedRandom.Next(2) == 0;

2
OpenRA.Mods.RA/Air/Helicopter.cs
View File

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

2
OpenRA.Mods.RA/Air/Plane.cs
View File

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

4
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -69,8 +69,8 @@ namespace OpenRA.Mods.RA.Buildings
if (buildingTraits.Contains<BibInfo>() && !(buildingTraits.Get<BibInfo>().HasMinibib)) if (buildingTraits.Contains<BibInfo>() && !(buildingTraits.Get<BibInfo>().HasMinibib))
buildingMaxBounds += new CVec(0, 1); buildingMaxBounds += new CVec(0, 1);
var scanStart = world.ClampToWorld(topLeft - new CVec(Adjacent, Adjacent)); var scanStart = world.Map.Clamp(topLeft - new CVec(Adjacent, Adjacent));
var scanEnd = world.ClampToWorld(topLeft + buildingMaxBounds + new CVec(Adjacent, Adjacent)); var scanEnd = world.Map.Clamp(topLeft + buildingMaxBounds + new CVec(Adjacent, Adjacent));
var nearnessCandidates = new List<CPos>(); var nearnessCandidates = new List<CPos>();

2
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -385,7 +385,7 @@ namespace OpenRA.Mods.RA.Move
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Move") if (order.OrderString == "Move")
PerformMove(self, self.World.ClampToWorld(order.TargetLocation), PerformMove(self, self.World.Map.Clamp(order.TargetLocation),
order.Queued && !self.IsIdle); order.Queued && !self.IsIdle);
if (order.OrderString == "Stop") if (order.OrderString == "Stop")