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

use stream reader extensions for loading ra/cnc Terrain

Browse Source
This commit is contained in:
Matthias Mailänder
2013-08-25 14:29:03 +02:00
parent b44d5a87f6
commit ae00cb3adf
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
OpenRA.FileFormats/Map/Terrain.cs
View File

@@ -19,53 +19,55 @@ namespace OpenRA.FileFormats
public readonly int Width; public readonly int Width;
public readonly int Height; public readonly int Height;
public Terrain(Stream stream) public Terrain(Stream s)
{ {
// Try loading as a cnc .tem // Try loading as a cnc .tem
BinaryReader reader = new BinaryReader( stream ); Width = s.ReadUInt16();
Width = reader.ReadUInt16(); Height = s.ReadUInt16();
Height = reader.ReadUInt16();
/*NumTiles = */reader.ReadUInt16(); /*NumTiles = */s.ReadUInt16();
/*Zero1 = */reader.ReadUInt16(); /*Zero1 = */s.ReadUInt16();
/*uint Size = */reader.ReadUInt32(); /*uint Size = */s.ReadUInt32();
uint ImgStart = reader.ReadUInt32(); var imgStart = s.ReadUInt32();
/*Zero2 = */reader.ReadUInt32(); /*Zero2 = */s.ReadUInt32();
int IndexEnd, IndexStart; int indexEnd, indexStart;
if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
// ID1 = FFFFh for cnc
if (s.ReadUInt16() == 65535)
{ {
/*ID2 = */reader.ReadUInt16(); /*ID2 = */s.ReadUInt16();
IndexEnd = reader.ReadInt32(); indexEnd = s.ReadInt32();
IndexStart = reader.ReadInt32(); indexStart = s.ReadInt32();
} }
else // Load as a ra .tem else
{ {
stream.Position = 0; // Load as a ra .tem
reader = new BinaryReader( stream ); s.Position = 0;
Width = reader.ReadUInt16(); Width = s.ReadUInt16();
Height = reader.ReadUInt16(); Height = s.ReadUInt16();
/*NumTiles = */reader.ReadUInt16(); /*NumTiles = */s.ReadUInt16();
reader.ReadUInt16(); s.ReadUInt16();
/*XDim = */reader.ReadUInt16(); /*XDim = */s.ReadUInt16();
/*YDim = */reader.ReadUInt16(); /*YDim = */s.ReadUInt16();
/*uint FileSize = */reader.ReadUInt32(); /*uint FileSize = */s.ReadUInt32();
ImgStart = reader.ReadUInt32(); imgStart = s.ReadUInt32();
reader.ReadUInt32(); s.ReadUInt32();
reader.ReadUInt32(); s.ReadUInt32();
IndexEnd = reader.ReadInt32(); indexEnd = s.ReadInt32();
reader.ReadUInt32(); s.ReadUInt32();
IndexStart = reader.ReadInt32(); indexStart = s.ReadInt32();
} }
stream.Position = IndexStart;
foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) ) s.Position = indexStart;
foreach (byte b in s.ReadBytes(indexEnd - indexStart))
{ {
if (b != 255) if (b != 255)
{ {
stream.Position = ImgStart + b * Width * Height; s.Position = imgStart + b * Width * Height;
TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(Width * Height)); TileBitmapBytes.Add(s.ReadBytes(Width * Height));
} }
else else
TileBitmapBytes.Add(null); TileBitmapBytes.Add(null);