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

Use main.mix, if it exists.

Browse Source
This commit is contained in:
Bob
2009-11-23 16:33:01 +13:00
parent 6bca332959
commit d5d013ad32
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRa.FileFormats/Package.cs
View File

@@ -38,9 +38,10 @@ namespace OpenRa.FileFormats
return; return;
} }
} }
else
s.Seek( 0, SeekOrigin.Begin );
isEncrypted = false; isEncrypted = false;
s.Seek(0, SeekOrigin.Begin);
index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash); index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
} }

4
OpenRa.Game/MainWindow.cs
View File

@@ -26,7 +26,9 @@ namespace OpenRa.Game
public MainWindow(Settings settings) public MainWindow(Settings settings)
{ {
FileSystem.Mount(new Folder("../../../../")); FileSystem.Mount( new Folder( "../../../../" ) );
if( File.Exists( "../../../../main.mix" ) )
FileSystem.Mount(new Package("main.mix"));
FileSystem.Mount(new Package("redalert.mix")); FileSystem.Mount(new Package("redalert.mix"));
FileSystem.Mount(new Package("conquer.mix")); FileSystem.Mount(new Package("conquer.mix"));
FileSystem.Mount(new Package("hires.mix")); FileSystem.Mount(new Package("hires.mix"));