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

Merge pull request #10973 from reaperrr/fp-to-int2

Browse Source 
Getting rid of float in simulation code Part 2
This commit is contained in:
Matthias Mailänder
2016-03-28 17:13:52 +02:00
parent b162afee6b 1ee4131f35
commit 8ba875476f
15 changed files with 100 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Traits
public readonly string AmmoPoolName = "primary";
public readonly float MinefieldDepth = 1.5f;
public readonly WDist MinefieldDepth = new WDist(1536);
public object Create(ActorInitializer init) { return new Minelayer(init.Self); }
}
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA.Traits
}
}
static IEnumerable<CPos> GetMinefieldCells(CPos start, CPos end, float depth)
static IEnumerable<CPos> GetMinefieldCells(CPos start, CPos end, WDist depth)
{
var mins = CPos.Min(start, end);
var maxs = CPos.Max(start, end);
@@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.Traits
for (var i = mins.X; i <= maxs.X; i++)
for (var j = mins.Y; j <= maxs.Y; j++)
if (Math.Abs(q.X * i + q.Y * j + c) < depth)
if (Math.Abs(q.X * i + q.Y * j + c) * 1024 < depth.Length)
yield return new CPos(i, j);
}