From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 25 Oct 2004 07:33:02 +0000 (+0000)
Subject: don't warn about missing frames and skins in models that failed to load
X-Git-Tag: xonotic-v0.1.0preview~5425
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef2cf00cc642032d466020845f1eee88ed5c958b;p=xonotic%2Fdarkplaces.git

don't warn about missing frames and skins in models that failed to load


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4704 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index 5d3b55e0..ab11ec65 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -477,14 +477,14 @@ void CL_ValidateState(entity_state_t *s)
 
 	model = cl.model_precache[s->modelindex];
 	Mod_CheckLoaded(model);
-	if (model && s->frame >= model->numframes)
+	if (model && model->type && s->frame >= model->numframes)
 	{
-		Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name);
+		Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
 		s->frame = 0;
 	}
-	if (model && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
+	if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
 	{
-		Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name);
+		Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
 		s->skin = 0;
 	}
 }