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

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 8432a0a01763bb40e78bbd1d82ee1d98f9950d4a..7ad7020d9711dc03a4a0c160fecba8cde5f82ec7 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -91,7 +91,7 @@ static void VM_CL_setmodel (prvm_prog_t *prog)
 {
        prvm_edict_t    *e;
        const char              *m;
-       dp_model_t *mod;
+       model_t *mod;
        int                             i;
 
        VM_SAFEPARMCOUNT(2, VM_CL_setmodel);
@@ -420,7 +420,7 @@ static void VM_CL_precache_model (prvm_prog_t *prog)
 {
        const char      *name;
        int                     i;
-       dp_model_t              *m;
+       model_t         *m;
 
        VM_SAFEPARMCOUNT(1, VM_CL_precache_model);
 
@@ -441,7 +441,7 @@ static void VM_CL_precache_model (prvm_prog_t *prog)
                {
                        if (!cl.csqc_model_precache[i])
                        {
-                               cl.csqc_model_precache[i] = (dp_model_t*)m;
+                               cl.csqc_model_precache[i] = (model_t*)m;
                                PRVM_G_FLOAT(OFS_RETURN) = -(i+1);
                                return;
                        }
@@ -1299,7 +1299,7 @@ static void VM_CL_setmodelindex (prvm_prog_t *prog)
 //#334 string(float mdlindex) modelnameforindex (EXT_CSQC)
 static void VM_CL_modelnameforindex (prvm_prog_t *prog)
 {
-       dp_model_t *model;
+       model_t *model;
 
        VM_SAFEPARMCOUNT(1, VM_CL_modelnameforindex);
 
@@ -1872,7 +1872,7 @@ static void VM_CL_copyentity (prvm_prog_t *prog)
 // #404 void(vector org, string modelname, float startframe, float endframe, float framerate) effect (DP_SV_EFFECT)
 static void VM_CL_effect (prvm_prog_t *prog)
 {
-       dp_model_t *model;
+       model_t *model;
        vec3_t org;
        VM_SAFEPARMCOUNT(5, VM_CL_effect);
        VectorCopy(PRVM_G_VECTOR(OFS_PARM0), org);
@@ -2302,7 +2302,7 @@ static void VM_CL_setattachment (prvm_prog_t *prog)
        const char *tagname;
        int modelindex;
        int tagindex;
-       dp_model_t *model;
+       model_t *model;
        VM_SAFEPARMCOUNT(3, VM_CL_setattachment);
 
        e = PRVM_G_EDICT(OFS_PARM0);
@@ -2347,7 +2347,7 @@ static void VM_CL_setattachment (prvm_prog_t *prog)
 
 static int CL_GetTagIndex (prvm_prog_t *prog, prvm_edict_t *e, const char *tagname)
 {
-       dp_model_t *model = CL_GetModelFromEdict(e);
+       model_t *model = CL_GetModelFromEdict(e);
        if (model)
                return Mod_Alias_GetTagIndexForName(model, (int)PRVM_clientedictfloat(e, skin), tagname);
        else
@@ -2357,7 +2357,7 @@ static int CL_GetTagIndex (prvm_prog_t *prog, prvm_edict_t *e, const char *tagna
 static int CL_GetExtendedTagInfo (prvm_prog_t *prog, prvm_edict_t *e, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix)
 {
        int r;
-       dp_model_t *model;
+       model_t *model;
 
        *tagname = NULL;
        *parentindex = 0;
@@ -2380,7 +2380,7 @@ static int CL_GetExtendedTagInfo (prvm_prog_t *prog, prvm_edict_t *e, int tagind
 
 int CL_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent)
 {
-       dp_model_t *model;
+       model_t *model;
        if ((model = CL_GetModelFromEdict(ent)) && model->type == mod_alias)
                return -1;
        return 1;
@@ -2418,7 +2418,7 @@ void CL_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out,
 
 static int CL_GetEntityLocalTagMatrix(prvm_prog_t *prog, prvm_edict_t *ent, int tagindex, matrix4x4_t *out)
 {
-       dp_model_t *model;
+       model_t *model;
        if (tagindex >= 0
         && (model = CL_GetModelFromEdict(ent))
         && model->animscenes)
@@ -2447,7 +2447,7 @@ int CL_GetTagMatrix (prvm_prog_t *prog, matrix4x4_t *out, prvm_edict_t *ent, int
        int ret;
        int attachloop;
        matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
-       dp_model_t *model;
+       model_t *model;
        vec3_t shadingorigin;
 
        *out = identitymatrix; // warnings and errors return identical matrix
@@ -2576,7 +2576,7 @@ static void VM_CL_gettaginfo (prvm_prog_t *prog)
        const char *tagname;
        int returncode;
        vec3_t forward, left, up, origin;
-       const dp_model_t *model;
+       const model_t *model;
 
        VM_SAFEPARMCOUNT(2, VM_CL_gettaginfo);
 
@@ -3292,7 +3292,7 @@ static void VM_CL_R_PolygonBegin (prvm_prog_t *prog)
        const char *texname;
        int drawflags;
        qbool draw2d;
-       dp_model_t *mod;
+       model_t *mod;
 
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_CL_R_PolygonBegin);
 
@@ -3328,7 +3328,7 @@ static void VM_CL_R_PolygonVertex (prvm_prog_t *prog)
        const prvm_vec_t *c = PRVM_G_VECTOR(OFS_PARM2);
        const prvm_vec_t a = PRVM_G_FLOAT(OFS_PARM3);
        float *o;
-       dp_model_t *mod = prog->polygonbegin_model;
+       model_t *mod = prog->polygonbegin_model;
 
        VM_SAFEPARMCOUNT(4, VM_CL_R_PolygonVertex);
 
@@ -3365,7 +3365,7 @@ static void VM_CL_R_PolygonEnd (prvm_prog_t *prog)
        qbool hasalpha;
        int e0 = 0, e1 = 0, e2 = 0;
        float *o;
-       dp_model_t *mod = prog->polygonbegin_model;
+       model_t *mod = prog->polygonbegin_model;
        msurface_t *surf;
        texture_t *tex;
        int materialflags;
@@ -3760,7 +3760,7 @@ static void VM_CL_checkpvs (prvm_prog_t *prog)
 static void VM_CL_skel_create(prvm_prog_t *prog)
 {
        int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0);
-       dp_model_t *model = CL_GetModelByIndex(modelindex);
+       model_t *model = CL_GetModelByIndex(modelindex);
        skeleton_t *skeleton;
        int i;
        PRVM_G_FLOAT(OFS_RETURN) = 0;
@@ -3790,7 +3790,7 @@ static void VM_CL_skel_build(prvm_prog_t *prog)
        float retainfrac = PRVM_G_FLOAT(OFS_PARM3);
        int firstbone = PRVM_G_FLOAT(OFS_PARM4) - 1;
        int lastbone = PRVM_G_FLOAT(OFS_PARM5) - 1;
-       dp_model_t *model = CL_GetModelByIndex(modelindex);
+       model_t *model = CL_GetModelByIndex(modelindex);
        int numblends;
        int bonenum;
        int blendindex;
@@ -4033,7 +4033,7 @@ static void VM_CL_skel_delete(prvm_prog_t *prog)
 static void VM_CL_frameforname(prvm_prog_t *prog)
 {
        int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0);
-       dp_model_t *model = CL_GetModelByIndex(modelindex);
+       model_t *model = CL_GetModelByIndex(modelindex);
        const char *name = PRVM_G_STRING(OFS_PARM1);
        int i;
        PRVM_G_FLOAT(OFS_RETURN) = -1;
@@ -4053,7 +4053,7 @@ static void VM_CL_frameforname(prvm_prog_t *prog)
 static void VM_CL_frameduration(prvm_prog_t *prog)
 {
        int modelindex = (int)PRVM_G_FLOAT(OFS_PARM0);
-       dp_model_t *model = CL_GetModelByIndex(modelindex);
+       model_t *model = CL_GetModelByIndex(modelindex);
        int framenum = (int)PRVM_G_FLOAT(OFS_PARM1);
        PRVM_G_FLOAT(OFS_RETURN) = 0;
        if (!model || !model->animscenes || framenum < 0 || framenum >= model->numframes)