zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make engine.c's loadpalette return -1 if palette.dat is not found.

Browse source 
... and initengine now returns 1 if loadpalette() fails.

git-svn-id: https://svn.eduke32.com/eduke32@2514 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-22 22:46:39 +00:00
parent 993b971107
commit 55dc8fee40
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
polymer/eduke32/build/src/engine.c
View file

@ -7445,12 +7445,12 @@ static void initfastcolorlookup(int32_t rscale, int32_t gscale, int32_t bscale)
// //
// loadpalette (internal) // loadpalette (internal)
// //
static void loadpalette(void) static int32_t loadpalette(void)
{ {
int32_t fil; int32_t fil;
if (paletteloaded != 0) return; if (paletteloaded != 0) return 0;
if ((fil = kopen4load("palette.dat",0)) == -1) return; if ((fil = kopen4load("palette.dat",0)) == -1) return -1;
kread(fil,palette,768); kread(fil,palette,768);
kread(fil,&numshades,2); numshades = B_LITTLE16(numshades); kread(fil,&numshades,2); numshades = B_LITTLE16(numshades);
@ -7465,10 +7465,12 @@ static void loadpalette(void)
fixtransluscence(FP_OFF(transluc)); fixtransluscence(FP_OFF(transluc));
kread(fil,palookup[globalpal],numshades<<8); kread(fil,palookup[globalpal],numshades<<8); // read base shade table (palookup 0)
kread(fil,transluc,65536); kread(fil,transluc,65536); // read translucency (blending) table
if (crc32once((uint8_t *)transluc, 65536)==0x94a1fac6) kclose(fil);
if (crc32once((uint8_t *)transluc, 65536)==0x94a1fac6) // Duke3D 1.5 GRP
{ {
int32_t i; int32_t i;
// fix up translucency table so that transluc(255,x) // fix up translucency table so that transluc(255,x)
@ -7480,8 +7482,6 @@ static void loadpalette(void)
} }
} }
kclose(fil);
initfastcolorlookup(30, 59, 11); initfastcolorlookup(30, 59, 11);
{ {
@ -7494,6 +7494,8 @@ static void loadpalette(void)
} }
paletteloaded = 1; paletteloaded = 1;
return 0;
} }
@ -8040,7 +8042,8 @@ int32_t initengine(void)
hitickspersec = 1.0; hitickspersec = 1.0;
#endif #endif
if (loadtables()) return 1; if (loadtables())
return 1;
xyaspect = -1; xyaspect = -1;
@ -8079,7 +8082,9 @@ int32_t initengine(void)
visibility = 512; visibility = 512;
parallaxvisibility = 512; parallaxvisibility = 512;
loadpalette(); if (loadpalette())
return 1;
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (!hicfirstinit) hicinit(); if (!hicfirstinit) hicinit();
if (!mdinited) mdinit(); if (!mdinited) mdinit();