From 36ac9e156a2572d26b6cd532738bedd0c0104579 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 2 Nov 2009 23:35:28 +1300 Subject: [PATCH] killing some pre-LINQ BS in Package --- OpenRa.FileFormats/Package.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/OpenRa.FileFormats/Package.cs b/OpenRa.FileFormats/Package.cs index 947e19f3d5..fd5eff64ed 100644 --- a/OpenRa.FileFormats/Package.cs +++ b/OpenRa.FileFormats/Package.cs @@ -19,15 +19,6 @@ namespace OpenRa.FileFormats readonly long dataStart; readonly Stream s; - public static Dictionary MakeDict(IEnumerable values, Converter keyFunc) - { - var dict = new Dictionary(); - foreach (var v in values) - dict.Add(keyFunc(v), v); - - return dict; - } - public Package(string filename) { this.filename = filename; @@ -43,14 +34,14 @@ namespace OpenRa.FileFormats isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted); if( isEncrypted ) { - index = MakeDict(ParseRaHeader( s, out dataStart ), x => x.Hash ); + index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash); return; } } isEncrypted = false; 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;