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

Use var everywhere

Browse Source
This commit is contained in:
ScottNZ
2014-06-15 22:17:34 +12:00
parent dbffce81a6
commit 90894aa03e
99 changed files with 312 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Move
static object LoadSpeeds(MiniYaml y)
{
Dictionary<string, TerrainInfo> ret = new Dictionary<string, TerrainInfo>();
var ret = new Dictionary<string, TerrainInfo>();
foreach (var t in y.ToDictionary()["TerrainSpeeds"].Nodes)
{
var speed = FieldLoader.GetValue<decimal>("speed", t.Value.Value);
@@ -165,8 +165,8 @@ namespace OpenRA.Mods.RA.Move
if (checkTransientActors)
{
bool canIgnoreMovingAllies = self != null && !blockedByMovers;
bool needsCellExclusively = self == null || Crushes == null;
var canIgnoreMovingAllies = self != null && !blockedByMovers;
var needsCellExclusively = self == null || Crushes == null;
foreach(var a in world.ActorMap.GetUnitsAt(cell))
{
if (a == ignoreActor) continue;
@@ -323,7 +323,7 @@ namespace OpenRA.Mods.RA.Move
var searched = new List<CPos>();
// Limit search to a radius of 10 tiles
for (int r = minRange; r < maxRange; r++)
for (var r = minRange; r < maxRange; r++)
{
foreach (var tile in self.World.Map.FindTilesInCircle(target, r).Except(searched))
{
@@ -344,7 +344,7 @@ namespace OpenRA.Mods.RA.Move
return target;
var searched = new List<CPos>();
for (int r = minRange; r < maxRange; r++)
for (var r = minRange; r < maxRange; r++)
{
foreach (var tile in self.World.Map.FindTilesInCircle(target, r).Except(searched))
{

4
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -93,8 +93,8 @@ namespace OpenRA.Mods.RA.Move
static int HashList<T>(List<T> xs)
{
int hash = 0;
int n = 0;
var hash = 0;
var n = 0;
foreach (var x in xs)
hash += n++ * x.GetHashCode();

4
OpenRA.Mods.RA/Move/PathFinder.cs
View File

@@ -152,7 +152,7 @@ namespace OpenRA.Mods.RA.Move
static List<CPos> MakePath(CellInfo[,] cellInfo, CPos destination)
{
var ret = new List<CPos>();
CPos pathNode = destination;
var pathNode = destination;
while (cellInfo[pathNode.X, pathNode.Y].Path != pathNode)
{
@@ -248,7 +248,7 @@ namespace OpenRA.Mods.RA.Move
if (path.Count == 0)
return;
var prev = path[0];
for (int i = 0; i < path.Count; i++)
for (var i = 0; i < path.Count; i++)
{
var d = path[i] - prev;
if (Math.Abs(d.X) > 1 || Math.Abs(d.Y) > 1)

24
OpenRA.Mods.RA/Move/PathSearch.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Mods.RA.Move
if (customCost != null)
{
int c = customCost(p.Location);
var c = customCost(p.Location);
if (c == int.MaxValue)
return p.Location;
}
@@ -116,12 +116,12 @@ namespace OpenRA.Mods.RA.Move
// This current cell is ok; check all immediate directions:
considered.Add(p.Location);
for (int i = 0; i < nextDirections.Length; ++i)
for (var i = 0; i < nextDirections.Length; ++i)
{
CVec d = nextDirections[i].First;
var d = nextDirections[i].First;
nextDirections[i].Second = int.MaxValue;
CPos newHere = p.Location + d;
var newHere = p.Location + d;
// Is this direction flat-out unusable or already seen?
if (!world.Map.IsInMap(newHere.X, newHere.Y))
@@ -145,10 +145,10 @@ namespace OpenRA.Mods.RA.Move
if (est == int.MaxValue)
continue;
int cellCost = costHere;
var cellCost = costHere;
if (d.X * d.Y != 0) cellCost = (cellCost * 34) / 24;
int userCost = 0;
var userCost = 0;
if (customCost != null)
{
userCost = customCost(newHere);
@@ -167,7 +167,7 @@ namespace OpenRA.Mods.RA.Move
else if (uy == 1 && d.X > 0) cellCost += LaneBias;
}
int newCost = cellInfo[p.Location.X, p.Location.Y].MinCost + cellCost;
var newCost = cellInfo[p.Location.X, p.Location.Y].MinCost + cellCost;
// Cost is even higher; next direction:
if (newCost > cellInfo[newHere.X, newHere.Y].MinCost)
@@ -267,8 +267,8 @@ namespace OpenRA.Mods.RA.Move
if (result == null)
result = new CellInfo[world.Map.MapSize.X, world.Map.MapSize.Y];
for (int x = 0; x < world.Map.MapSize.X; x++)
for (int y = 0; y < world.Map.MapSize.Y; y++)
for (var x = 0; x < world.Map.MapSize.X; x++)
for (var y = 0; y < world.Map.MapSize.Y; y++)
result[ x, y ] = new CellInfo( int.MaxValue, new CPos( x, y ), false );
return result;
@@ -278,9 +278,9 @@ namespace OpenRA.Mods.RA.Move
{
return here =>
{
int diag = Math.Min(Math.Abs(here.X - destination.X), Math.Abs(here.Y - destination.Y));
int straight = (Math.Abs(here.X - destination.X) + Math.Abs(here.Y - destination.Y));
int h = (3400 * diag / 24) + 100 * (straight - (2 * diag));
var diag = Math.Min(Math.Abs(here.X - destination.X), Math.Abs(here.Y - destination.Y));
var straight = (Math.Abs(here.X - destination.X) + Math.Abs(here.Y - destination.Y));
var h = (3400 * diag / 24) + 100 * (straight - (2 * diag));
h = (int)(h * 1.001);
return h;
};