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

2
OpenRA.Mods.RA/Air/Helicopter.cs
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);

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

@@ -52,7 +52,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();

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))
buildingMaxBounds += new CVec(0, 1);
var scanStart = world.ClampToWorld(topLeft - new CVec(Adjacent, Adjacent));
var scanEnd = world.ClampToWorld(topLeft + buildingMaxBounds + new CVec(Adjacent, Adjacent));
var scanStart = world.Map.Clamp(topLeft - new CVec(Adjacent, Adjacent));
var scanEnd = world.Map.Clamp(topLeft + buildingMaxBounds + new CVec(Adjacent, Adjacent));
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)
{
if (order.OrderString == "Move")
PerformMove(self, self.World.ClampToWorld(order.TargetLocation),
PerformMove(self, self.World.Map.Clamp(order.TargetLocation),
order.Queued && !self.IsIdle);
if (order.OrderString == "Stop")