Remove redundant ampersand breaking ContainerOf and List_For_Each_Entry. Make all...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index af3768209a02293222677e625fb329fde899af64..a72a7ca6acf5b8a0142c5df48bc506834fb4635c 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -46,7 +46,7 @@ void SV_Physics_Toss (prvm_edict_t *ent);
 
 int SV_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent)
 {
-       dp_model_t *model;
+       model_t *model;
        if (
                        (model = SV_GetModelFromEdict(ent))
                        ?
@@ -122,7 +122,7 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // matrices to transform into/out of other entity's space
        matrix4x4_t matrix, imatrix;
        // model of other entity
-       dp_model_t *model;
+       model_t *model;
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
@@ -165,8 +165,8 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -274,7 +274,7 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // matrices to transform into/out of other entity's space
        matrix4x4_t matrix, imatrix;
        // model of other entity
-       dp_model_t *model;
+       model_t *model;
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
@@ -320,8 +320,8 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -437,7 +437,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // matrices to transform into/out of other entity's space
        matrix4x4_t matrix, imatrix;
        // model of other entity
-       dp_model_t *model;
+       model_t *model;
        // list of entities to test for collisions
        int numtouchedicts;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
@@ -502,8 +502,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -618,7 +618,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
-       dp_model_t *model;
+       model_t *model;
        int frame;
        // list of entities to test for collisions
        int numtouchedicts;
@@ -804,7 +804,7 @@ SV_LinkEdict
 void SV_LinkEdict (prvm_edict_t *ent)
 {
        prvm_prog_t *prog = SVVM_prog;
-       dp_model_t *model;
+       model_t *model;
        vec3_t mins, maxs, entmins, entmaxs, entangles;
        int modelindex;
 
@@ -1682,7 +1682,7 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime)
        int num_moved;
        int numcheckentities;
        static prvm_edict_t *checkentities[MAX_EDICTS];
-       dp_model_t *pushermodel;
+       model_t *pushermodel;
        trace_t trace, trace2;
        matrix4x4_t pusherfinalmatrix, pusherfinalimatrix;
        static unsigned short moved_edicts[MAX_EDICTS];
@@ -2965,7 +2965,7 @@ void SV_Physics_ClientMove(void)
 
        // call player physics, this needs the proper frametime
        PRVM_serverglobalfloat(frametime) = sv.frametime;
-       SV_ClientThink();
+       SV_PlayerPhysics();
 
        // call standard client pre-think, with frametime = 0
        PRVM_serverglobalfloat(time) = sv.time;
@@ -3013,7 +3013,7 @@ static void SV_Physics_ClientEntity_PreThink(prvm_edict_t *ent)
        // don't run physics here if running asynchronously
        if (host_client->clmovement_inputtimeout <= 0)
        {
-               SV_ClientThink();
+               SV_PlayerPhysics();
                //host_client->cmd.time = max(host_client->cmd.time, sv.time);
        }