zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add file existence check for model skins.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2436 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-10 09:44:54 +00:00
parent 96db75dc5e
commit 27e68e85e5
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
polymer/eduke32/build/src/defs.c
View file

@ -830,8 +830,8 @@ static int32_t defsparser(scriptfile *script)
break; break;
case T_DEFINEMODELSKIN: case T_DEFINEMODELSKIN:
{ {
int32_t palnum; int32_t palnum, i;
char *skinfn; char *skinfn, *tfn = NULL;
if (scriptfile_getsymbol(script,&palnum)) break; if (scriptfile_getsymbol(script,&palnum)) break;
if (scriptfile_getstring(script,&skinfn)) break; //skin filename if (scriptfile_getstring(script,&skinfn)) break; //skin filename
@ -851,6 +851,24 @@ static int32_t defsparser(scriptfile *script)
if (seenframe) { modelskin = ++lastmodelskin; } if (seenframe) { modelskin = ++lastmodelskin; }
seenframe = 0; seenframe = 0;
i = pathsearchmode;
pathsearchmode = 1;
if (findfrompath(skinfn,&tfn) < 0)
{
char buf[BMAX_PATH];
Bstrcpy(buf,skinfn);
kzfindfilestart(buf);
if (!kzfindfile(buf))
{
initprintf("Error: file '%s' does not exist\n",skinfn);
pathsearchmode = i;
break;
}
}
else Bfree(tfn);
pathsearchmode = i;
#ifdef USE_OPENGL #ifdef USE_OPENGL
switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), 0, 0.0f, 1.0f, 1.0f)) switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), 0, 0.0f, 1.0f, 1.0f))
{ {
@ -1151,8 +1169,8 @@ static int32_t defsparser(scriptfile *script)
case T_SKIN: case T_DETAIL: case T_GLOW: case T_SPECULAR: case T_NORMAL: case T_SKIN: case T_DETAIL: case T_GLOW: case T_SPECULAR: case T_NORMAL:
{ {
char *skintokptr = script->ltextptr; char *skintokptr = script->ltextptr;
char *skinend, *skinfn = 0; char *skinend, *skinfn = 0, *tfn = NULL;
int32_t palnum = 0, surfnum = 0; int32_t palnum = 0, surfnum = 0, i;
double param = 1.0, specpower = 1.0, specfactor = 1.0; double param = 1.0, specpower = 1.0, specfactor = 1.0;
static const tokenlist modelskintokens[] = static const tokenlist modelskintokens[] =
@ -1215,6 +1233,24 @@ static int32_t defsparser(scriptfile *script)
break; break;
} }
i = pathsearchmode;
pathsearchmode = 1;
if (findfrompath(skinfn,&tfn) < 0)
{
char buf[BMAX_PATH];
Bstrcpy(buf,skinfn);
kzfindfilestart(buf);
if (!kzfindfile(buf))
{
initprintf("Error: file '%s' does not exist\n",skinfn);
pathsearchmode = i;
break;
}
}
else Bfree(tfn);
pathsearchmode = i;
#ifdef USE_OPENGL #ifdef USE_OPENGL
switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), surfnum, param, specpower, specfactor)) switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), surfnum, param, specpower, specfactor))
{ {