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

Merge pull request #10270 from RoosterDragon/less-samples

Browse Source 
Remove some unneeded PerfSamples
This commit is contained in:
reaperrr
2015-12-27 15:52:12 +01:00
parent d2d302432e 6d02d5ebaa
commit 7bd0ce012d
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Network/Connection.cs
View File

@@ -14,7 +14,6 @@ using System.IO;
using System.Net.Sockets;
using System.Threading;
using OpenRA.Server;
using OpenRA.Support;
namespace OpenRA.Network
{
@@ -212,12 +211,6 @@ namespace OpenRA.Network
if (socket != null)
socket.Client.Close();
using (new PerfSample("Thread.Join"))
{
if (!t.Join(1000))
return;
}
base.Dispose(disposing);
}

11
OpenRA.Game/WorldUtils.cs
View File

@@ -32,13 +32,10 @@ namespace OpenRA
public static IEnumerable<Actor> FindActorsInCircle(this World world, WPos origin, WDist r)
{
using (new PerfSample("FindUnitsInCircle"))
{
// Target ranges are calculated in 2D, so ignore height differences
var vec = new WVec(r, r, WDist.Zero);
return world.ActorMap.ActorsInBox(origin - vec, origin + vec).Where(
a => (a.CenterPosition - origin).HorizontalLengthSquared <= r.LengthSquared);
}
// Target ranges are calculated in 2D, so ignore height differences
var vec = new WVec(r, r, WDist.Zero);
return world.ActorMap.ActorsInBox(origin - vec, origin + vec).Where(
a => (a.CenterPosition - origin).HorizontalLengthSquared <= r.LengthSquared);
}
public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text)