bind .oramap -> ZipFile; search for .zip and .oramap in the map enumerator

This commit is contained in:
Chris Forbes
2010-12-28 18:40:52 +13:00
parent cc6d445ef1
commit 81f6843791
2 changed files with 5 additions and 1 deletions

View File

@@ -42,6 +42,8 @@ namespace OpenRA.FileFormats
return new MixFile(filename, order++); return new MixFile(filename, order++);
else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase)) else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(filename, order++); return new ZipFile(filename, order++);
else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(filename, order++);
else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase)) else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
return new InstallShieldPackage(filename, order++); return new InstallShieldPackage(filename, order++);
else else

View File

@@ -50,7 +50,9 @@ namespace OpenRA
return NoMaps; return NoMaps;
// todo: look for compressed maps too. // 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<string, MapStub> FindMaps(string[] mods) Dictionary<string, MapStub> FindMaps(string[] mods)