mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 09:21:36 +00:00
bleh
git-svn-id: https://svn.eduke32.com/eduke32@544 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
4ec4aac70f
commit
fecd0c6e44
1 changed files with 48 additions and 19 deletions
|
@ -10,6 +10,7 @@
|
||||||
#include "baselayer.h"
|
#include "baselayer.h"
|
||||||
#include "scriptfile.h"
|
#include "scriptfile.h"
|
||||||
#include "cache1d.h"
|
#include "cache1d.h"
|
||||||
|
#include "kplib.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
T_EOF = -2,
|
T_EOF = -2,
|
||||||
|
@ -297,10 +298,15 @@ static int defsparser(scriptfile *script)
|
||||||
|
|
||||||
i = pathsearchmode;
|
i = pathsearchmode;
|
||||||
pathsearchmode = 1;
|
pathsearchmode = 1;
|
||||||
if (!findfrompath(fn,&tfn)) {
|
if (findfrompath(fn,&tfn) < 0) {
|
||||||
|
char buf[BMAX_PATH];
|
||||||
|
|
||||||
|
Bstrcpy(buf,fn);
|
||||||
|
kzfindfilestart(buf);
|
||||||
|
if (!kzfindfile(buf)) {
|
||||||
initprintf("Error: file '%s' does not exist\n",fn);
|
initprintf("Error: file '%s' does not exist\n",fn);
|
||||||
pathsearchmode = i;
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
} else Bfree(tfn);
|
} else Bfree(tfn);
|
||||||
pathsearchmode = i;
|
pathsearchmode = i;
|
||||||
|
|
||||||
|
@ -319,9 +325,15 @@ static int defsparser(scriptfile *script)
|
||||||
if (scriptfile_getstring(script,&fn[i])) break; //grab the 6 faces
|
if (scriptfile_getstring(script,&fn[i])) break; //grab the 6 faces
|
||||||
ii = pathsearchmode;
|
ii = pathsearchmode;
|
||||||
pathsearchmode = 1;
|
pathsearchmode = 1;
|
||||||
if (!findfrompath(fn[i],&tfn)) {
|
if (findfrompath(fn[i],&tfn) < 0) {
|
||||||
|
char buf[BMAX_PATH];
|
||||||
|
|
||||||
|
Bstrcpy(buf,fn[i]);
|
||||||
|
kzfindfilestart(buf);
|
||||||
|
if (!kzfindfile(buf)) {
|
||||||
initprintf("Error: file '%s' does not exist\n",fn[i]);
|
initprintf("Error: file '%s' does not exist\n",fn[i]);
|
||||||
happy = 0;
|
happy = 0;
|
||||||
|
}
|
||||||
} else Bfree(tfn);
|
} else Bfree(tfn);
|
||||||
pathsearchmode = ii;
|
pathsearchmode = ii;
|
||||||
}
|
}
|
||||||
|
@ -1072,9 +1084,15 @@ static int defsparser(scriptfile *script)
|
||||||
if (!fn[i]) initprintf("Error: missing '%s filename' for skybox definition near line %s:%d\n", skyfaces[i], script->filename, scriptfile_getlinum(script,skyboxtokptr)), happy = 0;
|
if (!fn[i]) initprintf("Error: missing '%s filename' for skybox definition near line %s:%d\n", skyfaces[i], script->filename, scriptfile_getlinum(script,skyboxtokptr)), happy = 0;
|
||||||
ii = pathsearchmode;
|
ii = pathsearchmode;
|
||||||
pathsearchmode = 1;
|
pathsearchmode = 1;
|
||||||
if (!findfrompath(fn[i],&tfn)) {
|
if (findfrompath(fn[i],&tfn) < 0) {
|
||||||
|
char buf[BMAX_PATH];
|
||||||
|
|
||||||
|
Bstrcpy(buf,fn[i]);
|
||||||
|
kzfindfilestart(buf);
|
||||||
|
if (!kzfindfile(buf)) {
|
||||||
initprintf("Error: file '%s' does not exist\n",fn[i]);
|
initprintf("Error: file '%s' does not exist\n",fn[i]);
|
||||||
happy = 0;
|
happy = 0;
|
||||||
|
}
|
||||||
} else Bfree(tfn);
|
} else Bfree(tfn);
|
||||||
pathsearchmode = ii;
|
pathsearchmode = ii;
|
||||||
}
|
}
|
||||||
|
@ -1163,9 +1181,15 @@ static int defsparser(scriptfile *script)
|
||||||
|
|
||||||
i = pathsearchmode;
|
i = pathsearchmode;
|
||||||
pathsearchmode = 1;
|
pathsearchmode = 1;
|
||||||
if (!findfrompath(fn,&tfn)) {
|
if (findfrompath(fn,&tfn) < 0) {
|
||||||
|
char buf[BMAX_PATH];
|
||||||
|
|
||||||
|
Bstrcpy(buf,fn);
|
||||||
|
kzfindfilestart(buf);
|
||||||
|
if (!kzfindfile(buf)) {
|
||||||
initprintf("Error: file '%s' does not exist\n",fn);
|
initprintf("Error: file '%s' does not exist\n",fn);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
} else Bfree(tfn);
|
} else Bfree(tfn);
|
||||||
pathsearchmode = i;
|
pathsearchmode = i;
|
||||||
xscale = 1.0f / xscale;
|
xscale = 1.0f / xscale;
|
||||||
|
@ -1205,10 +1229,15 @@ static int defsparser(scriptfile *script)
|
||||||
|
|
||||||
i = pathsearchmode;
|
i = pathsearchmode;
|
||||||
pathsearchmode = 1;
|
pathsearchmode = 1;
|
||||||
if (!findfrompath(fn,&tfn)) {
|
if (findfrompath(fn,&tfn) < 0) {
|
||||||
|
char buf[BMAX_PATH];
|
||||||
|
|
||||||
|
Bstrcpy(buf,fn);
|
||||||
|
kzfindfilestart(buf);
|
||||||
|
if (!kzfindfile(buf)) {
|
||||||
initprintf("Error: file '%s' does not exist\n",fn);
|
initprintf("Error: file '%s' does not exist\n",fn);
|
||||||
pathsearchmode = i;
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
} else Bfree(tfn);
|
} else Bfree(tfn);
|
||||||
pathsearchmode = i;
|
pathsearchmode = i;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue