stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 12:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix inconsistencies between the "file specification" (as documented on zee internetz) and what devteam.pcx from Descent actually contained (the only pcx I have)

Browse source
This commit is contained in:
Magnus Norddahl 2020-02-16 17:10:57 +01:00
parent c1130b4c62
commit 4d3fea0088
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/IO/FileImageReader.cs
View file

@ -57,10 +57,13 @@ namespace CodeImp.DoomBuilder.IO
int numColorPlanes = reader.ReadByte(); int numColorPlanes = reader.ReadByte();
int planePitch = reader.ReadUInt16(); // always even int planePitch = reader.ReadUInt16(); // always even
int paletteInfo = reader.ReadUInt16(); // 1=color/bw palette, 2=grayscale image int paletteInfo = reader.ReadUInt16(); // 1=color/bw palette, 2=grayscale image
int width = reader.ReadUInt16(); int screenwidth = reader.ReadUInt16();
int height = reader.ReadUInt16(); int screenheight = reader.ReadUInt16();
reader.ReadBytes(54); // reserved reader.ReadBytes(54); // reserved
int width = rightMargin - leftMargin + 1;
int height = bottomMargin - topMargin + 1;
int vgaPaletteID = 0; int vgaPaletteID = 0;
byte[] vgaPalette = null; byte[] vgaPalette = null;
@ -90,7 +93,7 @@ namespace CodeImp.DoomBuilder.IO
byte[] imageData = new byte[width * height * 4]; byte[] imageData = new byte[width * height * 4];
int destpitch = width * 4; int destpitch = width * 4;
if (bitsPerComponent == 4 && numColorPlanes == 1 && paletteInfo == 1) // 16 colors from a palette if (bitsPerComponent == 4 && numColorPlanes == 1 && paletteInfo < 2) // 16 colors from a palette
{ {
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
@ -128,7 +131,7 @@ namespace CodeImp.DoomBuilder.IO
} }
} }
} }
else if (bitsPerComponent == 8 && numColorPlanes == 1 && paletteInfo == 1) // 256 colors from a palette else if (bitsPerComponent == 8 && numColorPlanes == 1 && paletteInfo < 2) // 256 colors from a palette
{ {
if (version == 5) if (version == 5)
{ {