model_shared: Rename dp_model_t to model_t, to avoid confusion with the dpm format

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index a78b67f61921e0c429836e0d195d99784abaec54..4f1a07e2ac4bfa606a778918c7daab0e9fff68c0 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1953,7 +1953,7 @@ static void CL_ParseServerInfo (void)
 
 void CL_ValidateState(entity_state_t *s)
 {
-       dp_model_t *model;
+       model_t *model;
 
        if (!s->active)
                return;
@@ -2345,7 +2345,7 @@ static void CL_ParseEffect2 (void)
        CL_Effect(org, CL_GetModelByIndex(modelindex), startframe, framecount, framerate);
 }
 
-void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning)
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
 {
        int i;
        beam_t *b = NULL;
@@ -2384,7 +2384,7 @@ void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning
                Con_DPrint("beam list overflow!\n");
 }
 
-static void CL_ParseBeam (dp_model_t *m, int lightning)
+static void CL_ParseBeam (model_t *m, int lightning)
 {
        int ent;
        vec3_t start, end;
@@ -3994,7 +3994,7 @@ void CL_ParseServerMessage(void)
                                        {
                                                if (i >= 1 && i < MAX_MODELS)
                                                {
-                                                       dp_model_t *model = Mod_ForName(s, false, false, s[0] == '*' ? cl.model_name[1] : NULL);
+                                                       model_t *model = Mod_ForName(s, false, false, s[0] == '*' ? cl.model_name[1] : NULL);
                                                        if (!model)
                                                                Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
                                                        cl.model_precache[i] = model;