added scr_screenshot_jpeg_quality cvar (and added it to the menu)

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 83ba3545cc6b86601ef3388ba08e1837928fdd73..fd52653a31e2dc880509b8a74b8bc39483e7feca 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -248,13 +248,15 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
                        //Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
                                // entity is trapped in another solid
                                VectorClear(ent->v->velocity);
                                return 3;
                        }
+                       */
 
                        if (trace.fraction > 0)
                        {
@@ -341,13 +343,15 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
 
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
                                // entity is trapped in another solid
                                VectorClear(ent->v->velocity);
                                return 3;
                        }
+                       */
 
                        if (trace.fraction > 0)
                        {
@@ -966,6 +970,8 @@ void SV_WalkMove (edict_t *ent)
        vec3_t upmove, downmove, oldorg, oldvel, nosteporg, nostepvel, stepnormal;
        trace_t downtrace;
 
+       SV_CheckVelocity(ent);
+
        // do a regular slide move unless it looks like you ran into a step
        oldonground = (int)ent->v->flags & FL_ONGROUND;
        ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
@@ -975,6 +981,8 @@ void SV_WalkMove (edict_t *ent)
 
        clip = SV_FlyMove (ent, sv.frametime, NULL);
 
+       SV_CheckVelocity(ent);
+
        // if move didn't block on a step, return
        if ( !(clip & 2) )
                return;
@@ -990,10 +998,9 @@ void SV_WalkMove (edict_t *ent)
                        return;
        }
 
-       if (sv_nostep.integer)
-               return;
+       SV_CheckVelocity(ent);
 
-       if ( (int)ent->v->flags & FL_WATERJUMP )
+       if (sv_nostep.integer || (int)ent->v->flags & FL_WATERJUMP )
                return;
 
        VectorCopy (ent->v->origin, nosteporg);
@@ -1052,6 +1059,8 @@ void SV_WalkMove (edict_t *ent)
                VectorCopy (nosteporg, ent->v->origin);
                VectorCopy (nostepvel, ent->v->velocity);
        }
+
+       SV_CheckVelocity(ent);
 }
 
 //============================================================================
@@ -1126,21 +1135,17 @@ void SV_CheckWaterTransition (edict_t *ent)
                return;
        }
 
+       // check if the entity crossed into or out of water
+       if ((ent->v->watertype == CONTENTS_WATER || ent->v->watertype == CONTENTS_SLIME) != (cont == CONTENTS_WATER || cont == CONTENTS_SLIME))
+               SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
+
        if (cont <= CONTENTS_WATER)
        {
-               if (ent->v->watertype == CONTENTS_EMPTY && cont != CONTENTS_LAVA)
-                       // just crossed into water
-                       SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-
                ent->v->watertype = cont;
                ent->v->waterlevel = 1;
        }
        else
        {
-               if (ent->v->watertype != CONTENTS_EMPTY && ent->v->watertype != CONTENTS_LAVA)
-                       // just crossed into water
-                       SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
-
                ent->v->watertype = CONTENTS_EMPTY;
                ent->v->waterlevel = 0;
        }