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

StyleCop clean OpenRA.Game

Browse Source
This commit is contained in:
Matthias Mailänder
2015-01-02 15:11:36 +01:00
parent 9dd607c846
commit 44cd174a8d
61 changed files with 628 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Render/RenderBuildingWall.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA.Traits
return;
// Update connection to neighbours
var adjacentActors = CVec.directions.SelectMany(dir =>
var adjacentActors = CVec.Directions.SelectMany(dir =>
self.World.ActorMap.GetUnitsAt(self.Location + dir));
adjacent = 0;
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.RA.Traits
static void UpdateNeighbours(Actor self)
{
var adjacentActors = CVec.directions.SelectMany(dir =>
var adjacentActors = CVec.Directions.SelectMany(dir =>
self.World.ActorMap.GetUnitsAt(self.Location + dir))
.Select(a => a.TraitOrDefault<RenderBuildingWall>())
.Where(a => a != null);

2
OpenRA.Mods.RA/Traits/Buildings/RepairableBuilding.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Traits
public class RepairableBuilding : UpgradableTrait<RepairableBuildingInfo>, ITick
{
[Sync]
public int RepairersHash { get { return Repairers.Aggregate(0, (code, player) => code ^ Sync.hash_player(player)); } }
public int RepairersHash { get { return Repairers.Aggregate(0, (code, player) => code ^ Sync.HashPlayer(player)); } }
public List<Player> Repairers = new List<Player>();
Health Health;

4
OpenRA.Mods.RA/Traits/World/DomainIndex.cs
View File

@@ -91,7 +91,7 @@ namespace OpenRA.Mods.RA.Traits
{
// Select all neighbors inside the map boundries
var thisCell = cell; // benign closure hazard
var neighbors = CVec.directions.Select(d => d + thisCell)
var neighbors = CVec.Directions.Select(d => d + thisCell)
.Where(c => map.Contains(c));
var found = false;
@@ -208,7 +208,7 @@ namespace OpenRA.Mods.RA.Traits
domains[n] = domain;
// Don't crawl off the map, or add already-visited cells
var neighbors = CVec.directions.Select(d => n + d)
var neighbors = CVec.Directions.Select(d => n + d)
.Where(p => map.Contains(p) && !visited[p]);
foreach (var neighbor in neighbors)

2
OpenRA.Mods.RA/Traits/World/PathSearch.cs
View File

@@ -148,7 +148,7 @@ namespace OpenRA.Mods.RA.Traits
new CVec[] { new CVec(-1, -1), new CVec(0, -1), new CVec(1, -1) },
new CVec[] { new CVec(-1, -1), new CVec(0, -1), new CVec(1, -1), new CVec(1, 0), new CVec(1, 1) },
new CVec[] { new CVec(-1, -1), new CVec(-1, 0), new CVec(-1, 1) },
CVec.directions,
CVec.Directions,
new CVec[] { new CVec(1, -1), new CVec(1, 0), new CVec(1, 1) },
new CVec[] { new CVec(-1, -1), new CVec(-1, 0), new CVec(-1, 1), new CVec(0, 1), new CVec(1, 1) },
new CVec[] { new CVec(-1, 1), new CVec(0, 1), new CVec(1, 1) },

6
OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs
View File

@@ -25,9 +25,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
perfText.IsVisible = () => Game.Settings.Debug.PerfText;
perfText.GetText = () =>
"Tick {0} @ {1:F1} ms\nRender {2} @ {3:F1} ms\nBatches: {4}".F(
Game.LocalTick, PerfHistory.items["tick_time"].Average(Game.Settings.Debug.Samples),
Game.RenderFrame, PerfHistory.items["render"].Average(Game.Settings.Debug.Samples),
PerfHistory.items["batches"].LastValue);
Game.LocalTick, PerfHistory.Items["tick_time"].Average(Game.Settings.Debug.Samples),
Game.RenderFrame, PerfHistory.Items["render"].Average(Game.Settings.Debug.Samples),
PerfHistory.Items["batches"].LastValue);
}
}
}