merged two sprite functions into the main callback to slightly clean up the code...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 5580300fd8821df1a891b5b460822bba7a025168..2ecbd6d7b6ab7f494540e33fc9753e0aeadf3a74 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -448,14 +448,14 @@ void CL_ParseServerInfo (void)
        // world model
        CL_KeepaliveMessage ();
        cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true);
-       if (cl.model_precache[1] == NULL)
+       if (cl.model_precache[1]->Draw == NULL)
                Con_Printf("Map %s not found\n", parse_model_precache[1]);
 
        // normal models
        for (i=2 ; i<nummodels ; i++)
        {
                CL_KeepaliveMessage();
-               if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false)) == NULL)
+               if ((cl.model_precache[i] = Mod_ForName(parse_model_precache[i], false, false, false))->Draw == NULL)
                        Con_Printf("Model %s not found\n", parse_model_precache[i]);
        }
 
@@ -511,7 +511,6 @@ void CL_ValidateState(entity_state_t *s)
        }
 
        model = cl.model_precache[s->modelindex];
-       Mod_CheckLoaded(model);
        if (model && model->type && s->frame >= model->numframes)
        {
                Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);