From 81f6843791647e7531450a868eb9be13b2b4d6f8 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 28 Dec 2010 18:40:52 +1300 Subject: [PATCH] bind .oramap -> ZipFile; search for .zip and .oramap in the map enumerator --- OpenRA.FileFormats/Filesystem/FileSystem.cs | 2 ++ OpenRA.Game/ModData.cs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenRA.FileFormats/Filesystem/FileSystem.cs b/OpenRA.FileFormats/Filesystem/FileSystem.cs index 77d38ac623..ab34c81a3d 100644 --- a/OpenRA.FileFormats/Filesystem/FileSystem.cs +++ b/OpenRA.FileFormats/Filesystem/FileSystem.cs @@ -42,6 +42,8 @@ namespace OpenRA.FileFormats return new MixFile(filename, order++); else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase)) return new ZipFile(filename, order++); + else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase)) + return new ZipFile(filename, order++); else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase)) return new InstallShieldPackage(filename, order++); else diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index 7441aca779..00dca109f7 100755 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -50,7 +50,9 @@ namespace OpenRA return NoMaps; // todo: look for compressed maps too. - return Directory.GetDirectories(dir); + return Directory.GetDirectories(dir) + .Concat(Directory.GetFiles(dir, "*.zip")) + .Concat(Directory.GetFiles(dir, "*.oramap")); } Dictionary FindMaps(string[] mods)