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

Move ChooseRandomCell from WorldUtils to Map

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-06-13 14:02:51 +03:00
parent 77fb188585
commit f0c672b70c
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ using OpenRA.FileSystem;
using OpenRA.Network;
using OpenRA.Traits;
using OpenRA.Graphics;
using OpenRA.Support;
namespace OpenRA
{
@@ -556,5 +557,12 @@ namespace OpenRA
var r = Bounds;
return xy.Clamp(new Rectangle(r.X, r.Y, r.Width - 1, r.Height - 1));
}
public CPos ChooseRandomCell(MersenneTwister r)
{
return new CPos(
r.Next(Bounds.Left, Bounds.Right),
r.Next(Bounds.Top, Bounds.Bottom));
}
}
}

7
OpenRA.Game/WorldUtils.cs
View File

@@ -100,13 +100,6 @@ namespace OpenRA
: (edge ? w.Map.Bounds.Top : w.Map.Bounds.Bottom));
}
public static CPos ChooseRandomCell(this World w, MersenneTwister r)
{
return new CPos(
r.Next(w.Map.Bounds.Left, w.Map.Bounds.Right),
r.Next(w.Map.Bounds.Top, w.Map.Bounds.Bottom));
}
public static WRange DistanceToMapEdge(this World w, WPos pos, WVec dir)
{
var tl = w.Map.Bounds.TopLeftAsCPos().TopLeft;