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

4
OpenRA.Utility/Command.cs
View File

@@ -193,7 +193,7 @@ namespace OpenRA.Utility
GlobalFileSystem.LoadFromManifest(Game.modData.Manifest);
var srcRules = Game.modData.RulesetCache.LoadDefaultRules();
var srcPaletteInfo = srcRules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
int[] srcRemapIndex = srcPaletteInfo.RemapIndex;
var srcRemapIndex = srcPaletteInfo.RemapIndex;
var destMod = args[2].Split(':')[0];
Game.modData = new ModData(destMod);
@@ -400,7 +400,7 @@ namespace OpenRA.Utility
Console.WriteLine("<table align=\"center\" width=\"1024\"><tr><th colspan=\"2\" width=\"1024\">{0}</th></tr>", name);
foreach (var m in members.OrderBy(m => m.Name))
{
string desc = m.HasAttribute<DescAttribute>() ? m.GetCustomAttributes<DescAttribute>(true).First().Lines.JoinWith("\n") : "";
var desc = m.HasAttribute<DescAttribute>() ? m.GetCustomAttributes<DescAttribute>(true).First().Lines.JoinWith("\n") : "";
Console.WriteLine("<tr><td align=\"right\" width=\"50%\"><strong>{0}</strong></td><td>{1}</td></tr>".F(m.LuaDocString(), desc));
}
Console.WriteLine("</table>");

32
OpenRA.Utility/LegacyMapImporter.cs
View File

@@ -210,7 +210,7 @@ namespace OpenRA.Utility
static MemoryStream ReadPackedSection(IniSection mapPackSection)
{
var sb = new StringBuilder();
for (int i = 1;; i++)
for (var i = 1;; i++)
{
var line = mapPackSection.GetValue(i.ToString(), null);
if (line == null)
@@ -250,27 +250,27 @@ namespace OpenRA.Utility
void UnpackRATileData(MemoryStream ms)
{
for (int i = 0; i < mapSize; i++)
for (int j = 0; j < mapSize; j++)
for (var i = 0; i < mapSize; i++)
for (var j = 0; j < mapSize; j++)
map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
for (int j = 0; j < mapSize; j++)
for (int i = 0; i < mapSize; i++)
for (var j = 0; j < mapSize; j++)
for (var i = 0; i < mapSize; i++)
{
var tileID = ms.ReadUInt16();
map.MapTiles.Value[i, j].Type = tileID == (ushort)0 ? (ushort)255 : tileID; // RAED weirdness
}
for (int j = 0; j < mapSize; j++)
for (int i = 0; i < mapSize; i++)
for (var j = 0; j < mapSize; j++)
for (var i = 0; i < mapSize; i++)
map.MapTiles.Value[i, j].Index = ms.ReadUInt8();
}
void UnpackRAOverlayData(MemoryStream ms)
{
for (int j = 0; j < mapSize; j++)
for (var j = 0; j < mapSize; j++)
{
for (int i = 0; i < mapSize; i++)
for (var i = 0; i < mapSize; i++)
{
var o = ms.ReadUInt8();
var res = Pair.New((byte)0, (byte)0);
@@ -299,7 +299,7 @@ namespace OpenRA.Utility
if (terrain == null)
return;
foreach (KeyValuePair<string, string> kv in terrain)
foreach (var kv in terrain)
{
var loc = Exts.ParseIntegerInvariant(kv.Key);
map.Actors.Value.Add("Actor" + actorCount++,
@@ -313,13 +313,13 @@ namespace OpenRA.Utility
void UnpackCncTileData(Stream ms)
{
for (int i = 0; i < mapSize; i++)
for (int j = 0; j < mapSize; j++)
for (var i = 0; i < mapSize; i++)
for (var j = 0; j < mapSize; j++)
map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
for (int j = 0; j < mapSize; j++)
for (var j = 0; j < mapSize; j++)
{
for (int i = 0; i < mapSize; i++)
for (var i = 0; i < mapSize; i++)
{
map.MapTiles.Value[i, j].Type = ms.ReadUInt8();
map.MapTiles.Value[i, j].Index = ms.ReadUInt8();
@@ -333,7 +333,7 @@ namespace OpenRA.Utility
if (overlay == null)
return;
foreach (KeyValuePair<string, string> kv in overlay)
foreach (var kv in overlay)
{
var loc = Exts.ParseIntegerInvariant(kv.Key);
var cell = new CPos(loc % mapSize, loc / mapSize);
@@ -360,7 +360,7 @@ namespace OpenRA.Utility
if (terrain == null)
return;
foreach (KeyValuePair<string, string> kv in terrain)
foreach (var kv in terrain)
{
var loc = Exts.ParseIntegerInvariant(kv.Key);
map.Actors.Value.Add("Actor" + actorCount++,

2
OpenRA.Utility/UpgradeRules.cs
View File

@@ -315,7 +315,7 @@ namespace OpenRA.Utility
static void UpgradeTileset(int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
{
var parentKey = parent != null ? parent.Key.Split('@').First() : null;
List<MiniYamlNode> addNodes = new List<MiniYamlNode>();
var addNodes = new List<MiniYamlNode>();
foreach (var node in nodes)
{