- bugfix in Format80

- fixed heisenburg-endianness in map loader
    - THERES A BUG in the mix loading; I need another 4 bytes padding to load temperat.mix and snow.mix (not interior.mix, though)
    - ShpViewer can now load and view map files
    - Copy TEMPERAT, SNOW, INFERIOR (sic) mixes into $(SolutionDir) for this to work
    - Left-click to reload tile-ID file, middle-click scrolls
    - the tile-id file has some collisions between tile-sets, be careful about ordering if you change anything


git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1081 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
bob
2007-06-26 21:25:20 +00:00
parent f87448c958
commit 1438053505
15 changed files with 436 additions and 102 deletions

View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
using OpenRa.Core;
namespace OpenRa.FileFormats
{
@@ -122,11 +123,13 @@ namespace OpenRa.FileFormats
s.Seek(2 + 4 + (isRmix ? 4 : 0), SeekOrigin.Begin);
s.Seek(2, SeekOrigin.Current); //dword align
s.Seek( 4, SeekOrigin.Current ); //wtf, i dont know why i need this either :(
if (isEncrypted)
if( isEncrypted )
s.Seek(80, SeekOrigin.Current);
s.Seek(index.Count * PackageEntry.Size + e.Offset, SeekOrigin.Current);
s.Seek( index.Count * PackageEntry.Size + e.Offset, SeekOrigin.Current );
byte[] data = new byte[ e.Length ];
s.Read( data, 0, (int)e.Length );
return new MemoryStream(data);
@@ -140,7 +143,6 @@ namespace OpenRa.FileFormats
{
return GetContent(PackageEntry.HashFilename(filename));
}
}
[Flags]