globally rename model_t to dp_model_t for OpenSolaris. Sorry, guys who now have svn...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 45acfefa13cc5a42fb1d415d80e0cf99a855e596..1aedfe74bc3a281e4251ef6974963136396c1daf 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -87,7 +87,7 @@ void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius)
                cl.worldmodel->brush.FindNonSolidLocation(cl.worldmodel, in, out, radius);
 }
 
-model_t *CL_GetModelByIndex(int modelindex)
+dp_model_t *CL_GetModelByIndex(int modelindex)
 {
        if(!modelindex)
                return NULL;
@@ -105,7 +105,7 @@ model_t *CL_GetModelByIndex(int modelindex)
        return NULL;
 }
 
-model_t *CL_GetModelFromEdict(prvm_edict_t *ed)
+dp_model_t *CL_GetModelFromEdict(prvm_edict_t *ed)
 {
        if (!ed || ed->priv.server->free)
                return NULL;
@@ -126,7 +126,7 @@ void CL_LinkEdict(prvm_edict_t *ent)
 
        if (ent->fields.client->solid == SOLID_BSP)
        {
-               model_t *model = CL_GetModelByIndex( (int)ent->fields.client->modelindex );
+               dp_model_t *model = CL_GetModelByIndex( (int)ent->fields.client->modelindex );
                if (model == NULL)
                {
                        Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
@@ -226,7 +226,7 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        // matrices to transform into/out of other entity's space
        matrix4x4_t matrix, imatrix;
        // model of other entity
-       model_t *model;
+       dp_model_t *model;
        // list of entities to test for collisions
        int numtouchedicts;
        prvm_edict_t *touchedicts[MAX_EDICTS];
@@ -295,7 +295,7 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        // figure out whether this is a point trace for comparisons
        pointtrace = VectorCompare(clipmins, clipmaxs);
        // precalculate passedict's owner edict pointer for comparisons
-       traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : 0;
+       traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : NULL;
 
        // collide against network entities
        if (hitnetworkbrushmodels)