team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msvc ignores this. gcc doesn't. bah. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4626 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-03-30 11:52:09 +00:00
parent 42d428df5a
commit cef708e7af
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/server/svmodel.c
View File

@ -415,7 +415,7 @@ Mod_LoadModel
Loads a model into the cache Loads a model into the cache
================== ==================
*/ */
model_t *Mod_LoadModel (model_t *mod, qboolean crash) model_t *Mod_LoadModel (model_t *mod, enum mlverbosity_e verbose)
{ {
unsigned *buf; unsigned *buf;
qbyte stackbuf[1024]; // avoid dirtying the cache heap qbyte stackbuf[1024]; // avoid dirtying the cache heap
@ -437,7 +437,7 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
buf = (unsigned *)COM_LoadStackFile (mod->name, stackbuf, sizeof(stackbuf)); buf = (unsigned *)COM_LoadStackFile (mod->name, stackbuf, sizeof(stackbuf));
if (!buf) if (!buf)
{ {
if (crash) if (verbose >= MLV_ERROR)
SV_Error ("Mod_NumForName: %s not found", mod->name); SV_Error ("Mod_NumForName: %s not found", mod->name);
return NULL; return NULL;
} }
@ -529,9 +529,10 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
} }
#endif #endif
Con_Printf (CON_ERROR "Mod_NumForName: %s: format not recognised\n", mod->name); if (verbose >= MLV_WARN)
Con_Printf (CON_ERROR "Mod_NumForName: %s: format not recognised\n", mod->name);
couldntload: couldntload:
if (crash) if (verbose >= MLV_ERROR)
SV_Error ("Load failed on critical model %s", mod->name); SV_Error ("Load failed on critical model %s", mod->name);
return NULL; return NULL;
} }
@ -546,13 +547,13 @@ Mod_ForName
Loads in a model for the given name Loads in a model for the given name
================== ==================
*/ */
model_t *Mod_ForName (const char *name, qboolean crash) model_t *Mod_ForName (const char *name, enum mlverbosity_e verbose)
{ {
model_t *mod; model_t *mod;
mod = Mod_FindName (name); mod = Mod_FindName (name);
return Mod_LoadModel (mod, crash); return Mod_LoadModel (mod, verbose);
} }