kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug switch to filter out some load_world errors

Browse Source 
do not flag some map config errors that can be fixed by search&replace
(for use in map conversion scripts only)
This commit is contained in:
ac-stef
2016-11-01 00:40:10 +01:00
parent 64a7eef335
commit 5af661ddeb
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/rendermodel.cpp
+2 -2
View File
@@ -113,7 +113,7 @@ void mapmodel(int *rad, int *h, int *zoff, char *scale, char *name, char *flags)
{
if(*scale && *name) // ignore "mapmodel" commands with insufficient parameters
{
if(!strchr(name, '/') && !strchr(name, '\\')) flagmapconfigerror(LWW_CONFIGERR * 2); // throw errors for unconverted mapmodels (unspecific, because not all get detected)
if(!_ignoreillegalpaths && !strchr(name, '/') && !strchr(name, '\\')) flagmapconfigerror(LWW_CONFIGERR * 2); // throw errors for unconverted mapmodels (unspecific, because not all get detected)
intret(mapmodels.length());
mapmodelinfo &mmi = mapmodels.add();
mmi.rad = *rad;
@@ -959,7 +959,7 @@ bool preload_mapmodels(bool trydl)
entity &e = ents[i];
if(e.type!=MAPMODEL || !mapmodels.inrange(e.attr2)) continue;
mapmodels[ents[i].attr2].flags |= MMF_TEMP_USED;
if(e.attr4 && lookuptexture(e.attr4, notexture, trydl) == notexture) missing++;
if(e.attr4 && lookuptexture(e.attr4, notexture, trydl) == notexture && (!_ignoreillegalpaths || gettextureslot(e.attr4))) missing++;
}
loopv(mapmodels) if((mapmodels[i].flags & (MMF_REQUIRED | MMF_TEMP_USED)) && !loadmodel(NULL, i, trydl)) missing++;
return !missing;