X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=39cb72ad9309ec8e5d70d4084a9444ede18d103b;hb=ce1f098cd683f58c4d99bb1f53182f6f66c3f30c;hp=70369c9b2a9449807617e2459d8c9aba9c7e7609;hpb=22249b9c3863d57d01eddf792d3ccb32f0301fda;p=xonotic%2Fdarkplaces.git diff --git a/sv_phys.c b/sv_phys.c index 70369c9b..39cb72ad 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -107,7 +107,7 @@ trace_t SV_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]; @@ -264,7 +264,7 @@ int SV_PointSuperContents(const vec3_t point) // 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; unsigned int modelindex; int frame; // list of entities to test for collisions @@ -378,7 +378,7 @@ SV_LinkEdict */ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers) { - model_t *model; + dp_model_t *model; vec3_t mins, maxs; if (ent == prog->edicts) @@ -1062,7 +1062,7 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime) int num_moved; int numcheckentities; static prvm_edict_t *checkentities[MAX_EDICTS]; - model_t *pushermodel; + dp_model_t *pushermodel; trace_t trace; matrix4x4_t pusherfinalmatrix, pusherfinalimatrix; unsigned short moved_edicts[MAX_EDICTS];