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

killing some pre-LINQ BS in Package

Browse Source
This commit is contained in:
Chris Forbes
2009-11-02 23:35:28 +13:00
parent 5d07ca2c90
commit 36ac9e156a
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRa.FileFormats/Package.cs
View File

@@ -19,15 +19,6 @@ namespace OpenRa.FileFormats
readonly long dataStart; readonly long dataStart;
readonly Stream s; readonly Stream s;
public static Dictionary<K, V> MakeDict<K,V>(IEnumerable<V> values, Converter<V, K> keyFunc)
{
var dict = new Dictionary<K, V>();
foreach (var v in values)
dict.Add(keyFunc(v), v);
return dict;
}
public Package(string filename) public Package(string filename)
{ {
this.filename = filename; this.filename = filename;
@@ -43,14 +34,14 @@ namespace OpenRa.FileFormats
isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted); isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
if( isEncrypted ) if( isEncrypted )
{ {
index = MakeDict(ParseRaHeader( s, out dataStart ), x => x.Hash ); index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash);
return; return;
} }
} }
isEncrypted = false; isEncrypted = false;
s.Seek(0, SeekOrigin.Begin); s.Seek(0, SeekOrigin.Begin);
index = MakeDict(ParseTdHeader(s, out dataStart), x => x.Hash ); index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
} }
const long headerStart = 84; const long headerStart = 84;