summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2011-12-08 23:17:37 +0000
committerTim Angus <tim@ngus.net>2013-01-12 20:16:46 +0000
commit7d5490c275a2e79504ce1e003bb34fdeb69893d7 (patch)
tree009cab8635abcde70daa2c137eaae01071b4996e
parent2f868dd20b84e580408d8399420b47db77c47541 (diff)
Show warning when renderer cannot load model after checking all supported formats, instead of after each format.
-rw-r--r--src/renderer/tr_model.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/renderer/tr_model.c b/src/renderer/tr_model.c
index b79fd458..d574d95f 100644
--- a/src/renderer/tr_model.c
+++ b/src/renderer/tr_model.c
@@ -109,10 +109,6 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
return mod->index;
}
-#ifdef _DEBUG
- ri.Printf(PRINT_WARNING,"R_RegisterMD3: couldn't load %s\n", name);
-#endif
-
mod->type = MOD_BAD;
return 0;
}
@@ -148,7 +144,6 @@ qhandle_t R_RegisterMDR(const char *name, model_t *mod)
if(!loaded)
{
- ri.Printf(PRINT_WARNING,"R_RegisterMDR: couldn't load mdr file %s\n", name);
mod->type = MOD_BAD;
return 0;
}
@@ -184,7 +179,6 @@ qhandle_t R_RegisterIQM(const char *name, model_t *mod)
if(!loaded)
{
- ri.Printf(PRINT_WARNING,"R_RegisterIQM: couldn't load iqm file %s\n", name);
mod->type = MOD_BAD;
return 0;
}
@@ -372,11 +366,12 @@ qhandle_t RE_RegisterModel( const char *name ) {
name, altName );
}
- break;
+ return hModel;
}
}
- return hModel;
+ ri.Printf(PRINT_WARNING, "WARNING: Failed to load model %s!\n", name);
+ return 0;
}
/*