flush unused models when running dedicated server

[xonotic/darkplaces.git] / sv_move.c

diff --git a/sv_move.c b/sv_move.c
index 87f3ed434a38ab1cd53b99de326a0701472b501c..382c9a08fe7ce75ed49683c40f57c51f805f3566 100644 (file)
--- a/sv_move.c
+++ b/sv_move.c
@@ -71,7 +71,7 @@ realcheck:
        start[0] = stop[0] = (mins[0] + maxs[0])*0.5;
        start[1] = stop[1] = (mins[1] + maxs[1])*0.5;
        stop[2] = start[2] - 2*STEPSIZE;
-       trace = SV_Move (start, vec3_origin, vec3_origin, stop, true, ent);
+       trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent);
 
        if (trace.fraction == 1.0)
                return false;
@@ -84,7 +84,7 @@ realcheck:
                        start[0] = stop[0] = x ? maxs[0] : mins[0];
                        start[1] = stop[1] = y ? maxs[1] : mins[1];
                        
-                       trace = SV_Move (start, vec3_origin, vec3_origin, stop, true, ent);
+                       trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent);
                        
                        if (trace.fraction != 1.0 && trace.endpos[2] > bottom)
                                bottom = trace.endpos[2];
@@ -135,7 +135,7 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
                                if (dz < 30)
                                        neworg[2] += 8;
                        }
-                       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, neworg, false, ent);
+                       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, neworg, MOVE_NORMAL, ent);
        
                        if (trace.fraction == 1)
                        {
@@ -160,7 +160,7 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
        VectorCopy (neworg, end);
        end[2] -= STEPSIZE*2;
 
-       trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, false, ent);
+       trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent);
 
        if (trace.allsolid)
                return false;
@@ -168,7 +168,7 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
        if (trace.startsolid)
        {
                neworg[2] -= STEPSIZE;
-               trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, false, ent);
+               trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent);
                if (trace.allsolid || trace.startsolid)
                        return false;
        }
@@ -287,8 +287,8 @@ void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
        float                   d[3];
        float           tdir, olddir, turnaround;
 
-       olddir = anglemod( (int)(actor->v.ideal_yaw/45)*45 );
-       turnaround = anglemod(olddir - 180);
+       olddir = ANGLEMOD((int)(actor->v.ideal_yaw/45)*45);
+       turnaround = ANGLEMOD(olddir - 180);
 
        deltax = enemy->v.origin[0] - actor->v.origin[0];
        deltay = enemy->v.origin[1] - actor->v.origin[1];