fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

I screwed up The Wastes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5342 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-11-21 11:49:21 +00:00
parent d547047b7f
commit 36eb350dc9
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/client/renderer.c
View file

@ -1482,25 +1482,23 @@ qboolean R_ApplyRenderer_Load (rendererstate_t *newr)
host_basepal = (qbyte *)FS_LoadMallocFile ("gfx/palette.lmp", &sz); host_basepal = (qbyte *)FS_LoadMallocFile ("gfx/palette.lmp", &sz);
if (!host_basepal) if (!host_basepal)
host_basepal = (qbyte *)FS_LoadMallocFile ("wad/playpal", &sz); host_basepal = (qbyte *)FS_LoadMallocFile ("wad/playpal", &sz);
#if defined(Q2CLIENT) && defined(IMAGEFMT_PCX)
if (!host_basepal || sz != 768) if (!host_basepal || sz != 768)
{ {
qbyte *pcx=NULL; #if defined(Q2CLIENT) && defined(IMAGEFMT_PCX)
qbyte *pcx = COM_LoadTempFile("pics/colormap.pcx", 0, &sz);
#endif
if (host_basepal) if (host_basepal)
Z_Free(host_basepal); Z_Free(host_basepal);
host_basepal = BZ_Malloc(768); host_basepal = BZ_Malloc(768);
pcx = COM_LoadTempFile("pics/colormap.pcx", 0, &sz); #if defined(Q2CLIENT) && defined(IMAGEFMT_PCX)
if (!pcx || !ReadPCXPalette(pcx, sz, host_basepal)) if (pcx && ReadPCXPalette(pcx, sz, host_basepal))
goto q2colormap; //skip the colormap.lmp file as we already read it
else
#endif
{ {
memcpy(host_basepal, default_quakepal, 768); memcpy(host_basepal, default_quakepal, 768);
} }
else
{
//if (ReadPCXData(pcx, com_filesize, 256, VID_GRADES, colormap))
goto q2colormap; //skip the colormap.lmp file as we already read it
}
} }
#endif
{ {
qbyte *colormap = (qbyte *)FS_LoadMallocFile ("gfx/colormap.lmp", NULL); qbyte *colormap = (qbyte *)FS_LoadMallocFile ("gfx/colormap.lmp", NULL);