cleaned up client qc, menu qc, and server qc VM initialization a bit so they have...

[xonotic/darkplaces.git] / sv_move.c

diff --git a/sv_move.c b/sv_move.c
index 99e1f60b1d24af05d16affb68424f49c3ab2b685..bd7404c137f293f251aabe2d359ef0e7261d6db2 100644 (file)
--- a/sv_move.c
+++ b/sv_move.c
@@ -51,7 +51,7 @@ qboolean SV_CheckBottom (prvm_edict_t *ent)
                {
                        start[0] = x ? maxs[0] : mins[0];
                        start[1] = y ? maxs[1] : mins[1];
-                       if (!(SV_PointSuperContents(start) & SUPERCONTENTS_SOLID))
+                       if (!(SV_PointSuperContents(start) & (SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY)))
                                goto realcheck;
                }
 
@@ -222,14 +222,14 @@ facing it.
 
 ======================
 */
-void PF_changeyaw (void);
+void VM_changeyaw (void);
 qboolean SV_StepDirection (prvm_edict_t *ent, float yaw, float dist)
 {
        vec3_t          move, oldorigin;
        float           delta;
 
        ent->fields.server->ideal_yaw = yaw;
-       PF_changeyaw();
+       VM_changeyaw();
 
        yaw = yaw*M_PI*2 / 360;
        move[0] = cos(yaw)*dist;
@@ -367,9 +367,9 @@ qboolean SV_CloseEnough (prvm_edict_t *ent, prvm_edict_t *goal, float dist)
 
        for (i=0 ; i<3 ; i++)
        {
-               if (goal->fields.server->absmin[i] > ent->fields.server->absmax[i] + dist)
+               if (goal->priv.server->areamins[i] > ent->priv.server->areamaxs[i] + dist)
                        return false;
-               if (goal->fields.server->absmax[i] < ent->fields.server->absmin[i] - dist)
+               if (goal->priv.server->areamaxs[i] < ent->priv.server->areamins[i] - dist)
                        return false;
        }
        return true;