mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-11 10:40:47 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@993 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
b411c3b205
commit
cbba90b7c2
2 changed files with 3 additions and 4 deletions
|
@ -288,6 +288,7 @@ static int defsparser(scriptfile *script)
|
||||||
char *cmdtokptr;
|
char *cmdtokptr;
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
if (quitevent) return 0;
|
||||||
tokn = getatoken(script,basetokens,sizeof(basetokens)/sizeof(tokenlist));
|
tokn = getatoken(script,basetokens,sizeof(basetokens)/sizeof(tokenlist));
|
||||||
cmdtokptr = script->ltextptr;
|
cmdtokptr = script->ltextptr;
|
||||||
switch (tokn)
|
switch (tokn)
|
||||||
|
|
|
@ -156,11 +156,9 @@ int kopen4loadfrommod(char *filename, char searchfirst)
|
||||||
static char fn[BMAX_PATH];
|
static char fn[BMAX_PATH];
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
Bstrcpy(fn,mod_dir);
|
Bsprintf(fn,"%s/%s",mod_dir,filename);
|
||||||
Bstrcat(fn,"/");
|
|
||||||
Bstrcat(fn,filename);
|
|
||||||
r = kopen4load(fn,searchfirst);
|
r = kopen4load(fn,searchfirst);
|
||||||
if (r == -1)
|
if (r < 0)
|
||||||
r = kopen4load(filename,searchfirst);
|
r = kopen4load(filename,searchfirst);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue