nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-08 00:12:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hexen2: Fix heuristic to load qpic lumps that were previously being rejected.

Browse source
This commit is contained in:
Shpoike 2023-06-05 23:47:14 +01:00
parent 732e3a0847
commit d0141bd6ed
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/client/image.c
View file

@ -7436,7 +7436,9 @@ qbyte *ReadRawImageFile(qbyte *buf, int len, int *width, int *height, uploadfmt_
int w = LittleLong(((int*)buf)[0]);
int h = LittleLong(((int*)buf)[1]);
int i;
if (w >= 3 && h >= 4 && w*h+sizeof(int)*2 == len)
if (((w >= 3 && h >= 4)
||(w==26&&h==1) //hack for hexen2. stupid lack of a magic.
) && w*h+sizeof(int)*2 == len)
{ //quake lmp
if (force_rgba8)
{
@ -7484,6 +7486,22 @@ qbyte *ReadRawImageFile(qbyte *buf, int len, int *width, int *height, uploadfmt_
*format = foundalpha?PTI_RGBA8:PTI_RGBX8;
return data;
}
else if (len == 128*128 || len == 128*256)
{ //conchars lump (or h2). 0 is transparent.
qbyte *in = buf;
h = 128;
w = len/h;
data = BZ_Malloc(w * h * sizeof(int));
for (i = 0; i < w * h; i++)
{
((unsigned int*)data)[i] = d_8to24rgbtable[in[i]];
data[i*4+3] = (in[i] == 0)?0:255;
}
*width = w;
*height = h;
*format = PTI_RGBA8;
return data;
}
}
#endif