From 93d1d0f83e3efcef5d8188340478e21d11d2a6a5 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 8 Dec 2011 23:17:37 +0000 Subject: [PATCH] Show warning when renderer cannot load model after checking all supported formats, instead of after each format. --- code/renderer/tr_model.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/renderer/tr_model.c b/code/renderer/tr_model.c index 51e0427f..e07fc39c 100644 --- a/code/renderer/tr_model.c +++ b/code/renderer/tr_model.c @@ -108,10 +108,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; } @@ -147,7 +143,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; } @@ -183,7 +178,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; } @@ -371,11 +365,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; } /*