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

Remove oramod package support.

Browse Source
This commit is contained in:
Paul Chote
2017-03-18 12:39:20 +00:00
parent 5d5fd7a0e8
commit e984c98565
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,6 @@ namespace OpenRA.FileSystem
return new ZipFile(this, filename); return new ZipFile(this, filename);
if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase)) if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(this, filename); return new ZipFile(this, filename);
if (filename.EndsWith(".oramod", StringComparison.InvariantCultureIgnoreCase))
return new ZipFile(this, filename);
if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase)) if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
return new D2kSoundResources(this, filename); return new D2kSoundResources(this, filename);
if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase)) if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))

5
OpenRA.Game/InstalledMods.cs
View File

@@ -53,9 +53,6 @@ namespace OpenRA
var directory = new DirectoryInfo(resolved); var directory = new DirectoryInfo(resolved);
foreach (var subdir in directory.EnumerateDirectories()) foreach (var subdir in directory.EnumerateDirectories())
mods.Add(Pair.New(subdir.Name, subdir.FullName)); mods.Add(Pair.New(subdir.Name, subdir.FullName));
foreach (var file in directory.EnumerateFiles("*.oramod"))
mods.Add(Pair.New(Path.GetFileNameWithoutExtension(file.Name), file.FullName));
} }
catch (Exception e) catch (Exception e)
{ {
@@ -94,8 +91,6 @@ namespace OpenRA
using (var bitmap = new Bitmap(stream)) using (var bitmap = new Bitmap(stream))
icons[id] = sheetBuilder.Add(bitmap); icons[id] = sheetBuilder.Add(bitmap);
// Mods in the support directory and oramod packages (which are listed later
// in the CandidateMods list) override mods in the main install.
return new Manifest(id, package); return new Manifest(id, package);
} }
catch (Exception) catch (Exception)