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

Merge pull request #7247 from Hellhake/stylecop-game

Browse Source 
Fix StyleCop warnings in OpenRA.Game
This commit is contained in:
Oliver Brakmann
2015-01-02 12:58:04 +01:00
parent 7fa0a9722a 5a97a4b63b
commit 30e42cdc62
119 changed files with 547 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/FileSystem/D2kSoundResources.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.FileSystem
public string Name { get { return filename; } }
public int Priority { get { return 1000 + priority; }}
public int Priority { get { return 1000 + priority; } }
public IEnumerable<uint> ClassicHashes()
{

2
OpenRA.Game/FileSystem/Folder.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.FileSystem
public Stream GetContent(string filename)
{
try { return File.OpenRead( Path.Combine( path, filename ) ); }
try { return File.OpenRead(Path.Combine(path, filename)); }
catch { return null; }
}

1
OpenRA.Game/FileSystem/GlobalFileSystem.cs
View File

@@ -88,6 +88,7 @@ namespace OpenRA.FileSystem
return new MixFile(filename, type, order);
}
if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(filename, order);
if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))

10
OpenRA.Game/FileSystem/InstallShieldPackage.cs
View File

@@ -51,6 +51,7 @@ namespace OpenRA.FileSystem
var TOCreader = new BinaryReader(s);
var fileCountInDirs = new List<uint>();
// Parse directories
for (var i = 0; i < DirCount; i++)
fileCountInDirs.Add(ParseDirectory(TOCreader));
@@ -59,7 +60,6 @@ namespace OpenRA.FileSystem
foreach (var fileCount in fileCountInDirs)
for (var i = 0; i < fileCount; i++)
ParseFile(reader);
}
static uint ParseDirectory(BinaryReader reader)
@@ -68,7 +68,7 @@ namespace OpenRA.FileSystem
var FileCount = reader.ReadUInt16();
var ChunkSize = reader.ReadUInt16();
var NameLength = reader.ReadUInt16();
reader.ReadChars(NameLength); //var DirName = new String(reader.ReadChars(NameLength));
reader.ReadChars(NameLength); // var DirName = new String(reader.ReadChars(NameLength));
// Skip to the end of the chunk
reader.ReadBytes(ChunkSize - NameLength - 6);
@@ -84,11 +84,11 @@ namespace OpenRA.FileSystem
var ChunkSize = reader.ReadUInt16();
reader.ReadBytes(4);
var NameLength = reader.ReadByte();
var FileName = new String(reader.ReadChars(NameLength));
var FileName = new string(reader.ReadChars(NameLength));
var hash = PackageEntry.HashFilename(FileName, PackageHashType.Classic);
if (!index.ContainsKey(hash))
index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
index.Add(hash, new PackageEntry(hash, AccumulatedData, CompressedSize));
filenames.Add(FileName);
AccumulatedData += CompressedSize;
@@ -133,7 +133,7 @@ namespace OpenRA.FileSystem
return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
}
public int Priority { get { return 2000 + priority; }}
public int Priority { get { return 2000 + priority; } }
public string Name { get { return filename; } }
public void Write(Dictionary<string, byte[]> contents)

17
OpenRA.Game/FileSystem/MixFile.cs
View File

@@ -68,9 +68,8 @@ namespace OpenRA.FileSystem
entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
index = entries.ToDictionaryWithConflictLog(x => x.Hash,
"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, (isCncMix ? "C&C" : "RA/TS/RA2"), isEncrypted, dataStart),
null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
);
"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
}
static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
@@ -83,7 +82,7 @@ namespace OpenRA.FileSystem
for (var i = 0; i < numFiles; i++)
items.Add(new PackageEntry(s));
headerEnd = offset + 6 + numFiles*PackageEntry.Size;
headerEnd = offset + 6 + numFiles * PackageEntry.Size;
return items;
}
@@ -101,8 +100,8 @@ namespace OpenRA.FileSystem
var numFiles = ms.ReadUInt16();
// Decrypt the full header - round bytes up to a full block
var blockCount = (13 + numFiles*PackageEntry.Size)/8;
headerEnd = offset + 80 + blockCount*8;
var blockCount = (13 + numFiles * PackageEntry.Size) / 8;
headerEnd = offset + 80 + blockCount * 8;
return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
}
@@ -113,7 +112,7 @@ namespace OpenRA.FileSystem
var ms = new MemoryStream();
var writer = new BinaryWriter(ms);
foreach(var t in decrypted)
foreach (var t in decrypted)
writer.Write(t);
writer.Flush();
@@ -126,7 +125,7 @@ namespace OpenRA.FileSystem
s.Seek(offset, SeekOrigin.Begin);
// A block is a single encryption unit (represented as two 32-bit integers)
var ret = new uint[2*count];
var ret = new uint[2 * count];
for (var i = 0; i < ret.Length; i++)
ret[i] = s.ReadUInt32();
@@ -167,7 +166,7 @@ namespace OpenRA.FileSystem
return hash.HasValue ? GetContent(hash.Value) : null;
}
static readonly uint[] Nothing = {};
static readonly uint[] Nothing = { };
public IEnumerable<uint> ClassicHashes()
{
if (type == PackageHashType.Classic)

8
OpenRA.Game/FileSystem/PackageEntry.cs
View File

@@ -20,6 +20,7 @@ namespace OpenRA.FileSystem
public class PackageEntry
{
public const int Size = 12;
public readonly uint Hash;
public readonly uint Offset;
public readonly uint Length;
@@ -56,7 +57,7 @@ namespace OpenRA.FileSystem
public static uint HashFilename(string name, PackageHashType type)
{
switch(type)
switch (type)
{
case PackageHashType.Classic:
{
@@ -88,6 +89,7 @@ namespace OpenRA.FileSystem
while (i-- != 0)
name += name[a << 2];
}
return CRC32.Calculate(Encoding.ASCII.GetBytes(name));
}
@@ -95,7 +97,7 @@ namespace OpenRA.FileSystem
}
}
static Dictionary<uint, string> Names = new Dictionary<uint,string>();
static Dictionary<uint, string> Names = new Dictionary<uint, string>();
public static void AddStandardName(string s)
{
@@ -104,7 +106,5 @@ namespace OpenRA.FileSystem
var crcHash = HashFilename(s, PackageHashType.CRC32); // TS
Names.Add(crcHash, s);
}
public const int Size = 12;
}
}