added Mod_FindTriangleWithEdge and Mod_BuildTriangleNeighbors functions (not used...

[xonotic/darkplaces.git] / sv_move.c

diff --git a/sv_move.c b/sv_move.c
index 8bf64f62ae02e304d3bfe924d767a8dfd88527ce..5645c54078b051adcd1cd4b489db1ffafd5e2c57 100644 (file)
--- a/sv_move.c
+++ b/sv_move.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#define        STEPSIZE        18
-
 /*
 =============
 SV_CheckBottom
@@ -40,7 +38,7 @@ qboolean SV_CheckBottom (edict_t *ent)
        trace_t trace;
        int             x, y;
        float   mid, bottom;
-       
+
        VectorAdd (ent->v.origin, ent->v.mins, mins);
        VectorAdd (ent->v.origin, ent->v.maxs, maxs);
 
@@ -53,7 +51,7 @@ qboolean SV_CheckBottom (edict_t *ent)
                {
                        start[0] = x ? maxs[0] : mins[0];
                        start[1] = y ? maxs[1] : mins[1];
-                       if (SV_PointContents (start) != CONTENTS_SOLID)
+                       if (Mod_PointContents(start, sv.worldmodel) != CONTENTS_SOLID)
                                goto realcheck;
                }
 
@@ -66,29 +64,29 @@ realcheck:
 // check it for real...
 //
        start[2] = mins[2];
-       
+
 // the midpoint must be within 16 of the bottom
        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);
+       stop[2] = start[2] - 2*sv_stepheight.value;
+       trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent);
 
        if (trace.fraction == 1.0)
                return false;
        mid = bottom = trace.endpos[2];
-       
-// the corners must be within 16 of the midpoint       
+
+// the corners must be within 16 of the midpoint
        for     (x=0 ; x<=1 ; x++)
                for     (y=0 ; y<=1 ; y++)
                {
                        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];
-                       if (trace.fraction == 1.0 || mid - trace.endpos[2] > STEPSIZE)
+                       if (trace.fraction == 1.0 || mid - trace.endpos[2] > sv_stepheight.value)
                                return false;
                }
 
@@ -110,12 +108,12 @@ pr_global_struct->trace_normal is set to the normal of the blocking wall
 qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
 {
        float           dz;
-       vec3_t          oldorg, neworg, end;
+       vec3_t          oldorg, neworg, end, traceendpos;
        trace_t         trace;
        int                     i;
        edict_t         *enemy;
 
-// try the move        
+// try the move
        VectorCopy (ent->v.origin, oldorg);
        VectorAdd (ent->v.origin, move, neworg);
 
@@ -135,40 +133,41 @@ 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)
                        {
-                               if ( ((int)ent->v.flags & FL_SWIM) && SV_PointContents(trace.endpos) == CONTENTS_EMPTY )
+                               VectorCopy(trace.endpos, traceendpos);
+                               if ( ((int)ent->v.flags & FL_SWIM) && Mod_PointContents(traceendpos, sv.worldmodel) == CONTENTS_EMPTY )
                                        return false;   // swim monster left water
-       
-                               VectorCopy (trace.endpos, ent->v.origin);
+
+                               VectorCopy (traceendpos, ent->v.origin);
                                if (relink)
                                        SV_LinkEdict (ent, true);
                                return true;
                        }
-                       
+
                        if (enemy == sv.edicts)
                                break;
                }
-               
+
                return false;
        }
 
 // push down from a step height above the wished position
-       neworg[2] += STEPSIZE;
+       neworg[2] += sv_stepheight.value;
        VectorCopy (neworg, end);
-       end[2] -= STEPSIZE*2;
+       end[2] -= sv_stepheight.value*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;
 
        if (trace.startsolid)
        {
-               neworg[2] -= STEPSIZE;
-               trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, false, ent);
+               neworg[2] -= sv_stepheight.value;
+               trace = SV_Move (neworg, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent);
                if (trace.allsolid || trace.startsolid)
                        return false;
        }
@@ -181,7 +180,6 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
                        if (relink)
                                SV_LinkEdict (ent, true);
                        ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
-//     Con_Printf ("fall down\n"); 
                        return true;
                }
 
@@ -205,10 +203,8 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
        }
 
        if ( (int)ent->v.flags & FL_PARTIALGROUND )
-       {
-//             Con_Printf ("back on ground\n"); 
                ent->v.flags = (int)ent->v.flags & ~FL_PARTIALGROUND;
-       }
+
        ent->v.groundentity = EDICT_TO_PROG(trace.ent);
 
 // the move is ok
@@ -267,8 +263,6 @@ SV_FixCheckBottom
 */
 void SV_FixCheckBottom (edict_t *ent)
 {
-//     Con_Printf ("SV_FixCheckBottom\n");
-       
        ent->v.flags = (int)ent->v.flags | FL_PARTIALGROUND;
 }
 
@@ -325,7 +319,7 @@ void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
                d[2]=tdir;
        }
 
-       if (d[1]!=DI_NODIR && d[1]!=turnaround 
+       if (d[1]!=DI_NODIR && d[1]!=turnaround
        && SV_StepDirection(actor, d[1], dist))
                        return;
 
@@ -373,7 +367,7 @@ SV_CloseEnough
 qboolean SV_CloseEnough (edict_t *ent, edict_t *goal, float dist)
 {
        int             i;
-       
+
        for (i=0 ; i<3 ; i++)
        {
                if (goal->v.absmin[i] > ent->v.absmax[i] + dist)