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

track missing models without "nomodel"-crutch

Browse Source 
* missing models now have their own list "mdlnotfound".
* also added a few comments (looks silly, though)
This commit is contained in:
ac-stef
2014-11-26 21:23:59 +01:00
parent 6e0e7bb333
commit 2a6b8fb234
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/rendermodel.cpp
+17 -22
View File
@@ -109,56 +109,51 @@ COMMAND(mapmodel, "iiiss");
COMMAND(mapmodelreset, "");
hashtable<const char *, model *> mdllookup;
model *nomodel = NULL;
hashtable<const char *, char> mdlnotfound;
model *loadmodel(const char *name, int i, bool trydl)
model *loadmodel(const char *name, int i, bool trydl) // load model by name (optional) or from mapmodels[i]
{
if(!name)
if(!name) // name == NULL -> get index i from mapmodels[]
{
if(!mapmodels.inrange(i)) return NULL;
mapmodelinfo &mmi = mapmodels[i];
if(mmi.m) return mmi.m;
if(mmi.m) return mmi.m; // mapmodels[i] was already loaded
name = mmi.name;
}
if(mdlnotfound.access(name)) return NULL; // already tried to find that earlier -> not available
model **mm = mdllookup.access(name);
model *m;
if(mm) m = *mm;
if(mm) m = *mm; // a model of that name is already loaded
else
{
pushscontext(IEXC_MDLCFG);
m = new md2(name);
m = new md2(name); // try md2
loadingmodel = m;
if(!m->load())
if(!m->load()) // md2 didn't load
{
delete m;
m = new md3(name);
m = new md3(name); // try md3
loadingmodel = m;
if(!m->load())
if(!m->load()) // md3 didn't load -> we don't have that model
{
delete m;
loadingmodel = NULL;
m = loadingmodel = NULL;
if(trydl)
{
defformatstring(dl)("packages/models/%s", name);
requirepackage(PCK_MAPMODEL, dl);
}
else
{
conoutf("\f3failed to load model %s", name);
mdlnotfound.access(newstring(name), 0); // do not search for this name again
}
}
}
popscontext();
if(!loadingmodel)
{
if(!trydl)
{
conoutf("\f3failed to load model %s", name);
if(!nomodel) nomodel = new md2("nomodel");
m = nomodel;
mdllookup.access(newstring(name), m);
}
}
else mdllookup.access(m->name(), m);
if(loadingmodel && m) mdllookup.access(m->name(), m);
loadingmodel = NULL;
}
if(m == nomodel) return NULL;
if(mapmodels.inrange(i) && !mapmodels[i].m) mapmodels[i].m = m;
return m;
}