fix for 'falling' in a corner bug, thanks to Elric for finding the fix for this.

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 3f13b9cd3c75e4e77f790eb7a48ff912fa5c6084..94f2bdf0fa4f44f27a5333f2c88203d3ddbadfdb 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -943,13 +943,11 @@ void SV_WalkMove (edict_t *ent)
 
        // check for stuckness, possibly due to the limited precision of floats
        // in the clipping hulls
-       /*
        if (clip
         && fabs(oldorg[1] - ent->v.origin[1]) < 0.03125
         && fabs(oldorg[0] - ent->v.origin[0]) < 0.03125)
                // stepping up didn't make any progress
                clip = SV_TryUnstick (ent, oldvel);
-       */
 
        // extra friction based on view angle
        if (clip & 2 && sv_wallfriction.integer)
@@ -961,7 +959,7 @@ void SV_WalkMove (edict_t *ent)
 
        if (downtrace.plane.normal[2] > 0.7)
        {
-               if (ent->v.solid == SOLID_BSP)
+               //if (ent->v.solid == SOLID_BSP)
                {
                        ent->v.flags =  (int)ent->v.flags | FL_ONGROUND;
                        ent->v.groundentity = EDICT_TO_PROG(downtrace.ent);
@@ -1030,7 +1028,8 @@ void SV_Physics_Client (edict_t   *ent, int num)
                if (!SV_RunThink (ent))
                        return;
                SV_CheckWater (ent);
-               SV_FlyMove (ent, sv.frametime, NULL);
+               //SV_FlyMove (ent, sv.frametime, NULL);
+               SV_WalkMove (ent);
                break;
 
        case MOVETYPE_NOCLIP:
@@ -1038,6 +1037,7 @@ void SV_Physics_Client (edict_t   *ent, int num)
                        return;
                SV_CheckWater (ent);
                VectorMA (ent->v.origin, sv.frametime, ent->v.velocity, ent->v.origin);
+               VectorMA (ent->v.angles, sv.frametime, ent->v.avelocity, ent->v.angles);
                break;
 
        default:
@@ -1147,7 +1147,7 @@ void SV_CheckWaterTransition (edict_t *ent)
 
        if (cont <= CONTENTS_WATER)
        {
-               if (ent->v.watertype == CONTENTS_EMPTY)
+               if (ent->v.watertype == CONTENTS_EMPTY && cont != CONTENTS_LAVA)
                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
@@ -1156,7 +1156,7 @@ void SV_CheckWaterTransition (edict_t *ent)
        }
        else
        {
-               if (ent->v.watertype != CONTENTS_EMPTY)
+               if (ent->v.watertype != CONTENTS_EMPTY && ent->v.watertype != CONTENTS_LAVA)
                        // just crossed into water
                        SV_StartSound (ent, 0, "misc/h2ohit1.wav", 255, 1);
 
@@ -1185,12 +1185,18 @@ void SV_Physics_Toss (edict_t *ent)
 // if onground, return without moving
        if ((int)ent->v.flags & FL_ONGROUND)
        {
+               VectorClear(ent->v.velocity);
                if (ent->v.groundentity == 0)
                        return;
+               // if ent was supported by a brush model on previous frame,
+               // and groundentity is now freed, set groundentity to 0 (floating)
                groundentity = PROG_TO_EDICT(ent->v.groundentity);
-               if (groundentity != NULL && groundentity->v.solid == SOLID_BSP)
+               if (groundentity->v.solid == SOLID_BSP)
+               {
                        ent->suspendedinairflag = true;
-               else if (ent->suspendedinairflag && (groundentity == NULL || groundentity->free))
+                       return;
+               }
+               else if (ent->suspendedinairflag && groundentity->free)
                {
                        // leave it suspended in the air
                        ent->v.groundentity = 0;
@@ -1203,9 +1209,7 @@ void SV_Physics_Toss (edict_t *ent)
        SV_CheckVelocity (ent);
 
 // add gravity
-       if (ent->v.movetype != MOVETYPE_FLY
-        && ent->v.movetype != MOVETYPE_BOUNCEMISSILE // LordHavoc: enabled MOVETYPE_BOUNCEMISSILE
-        && ent->v.movetype != MOVETYPE_FLYMISSILE)
+       if (ent->v.movetype == MOVETYPE_TOSS || ent->v.movetype == MOVETYPE_BOUNCE)
                SV_AddGravity (ent);
 
 // move angles
@@ -1216,40 +1220,41 @@ void SV_Physics_Toss (edict_t *ent)
        trace = SV_PushEntity (ent, move, vec3_origin);
        if (ent->free)
                return;
-       if (trace.fraction == 1)
-               return;
 
-       if (ent->v.movetype == MOVETYPE_BOUNCEMISSILE)
-       {
-               ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 2.0);
-               ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
-       }
-       else if (ent->v.movetype == MOVETYPE_BOUNCE)
+       if (trace.fraction < 1)
        {
-               ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 1.5);
-               // LordHavoc: fixed grenades not bouncing when fired down a slope
-               if (trace.plane.normal[2] > 0.7 && DotProduct(trace.plane.normal, ent->v.velocity) < 60)
+               if (ent->v.movetype == MOVETYPE_BOUNCEMISSILE)
                {
-                       ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
-                       ent->v.groundentity = EDICT_TO_PROG(trace.ent);
-                       VectorClear (ent->v.velocity);
-                       VectorClear (ent->v.avelocity);
-               }
-               else
+                       ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 2.0);
                        ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
-       }
-       else
-       {
-               ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 1.0);
-               if (trace.plane.normal[2] > 0.7)
+               }
+               else if (ent->v.movetype == MOVETYPE_BOUNCE)
                {
-                       ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
-                       ent->v.groundentity = EDICT_TO_PROG(trace.ent);
-                       VectorClear (ent->v.velocity);
-                       VectorClear (ent->v.avelocity);
+                       ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 1.5);
+                       // LordHavoc: fixed grenades not bouncing when fired down a slope
+                       if (trace.plane.normal[2] > 0.7 && DotProduct(trace.plane.normal, ent->v.velocity) < 60)
+                       {
+                               ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
+                               ent->v.groundentity = EDICT_TO_PROG(trace.ent);
+                               VectorClear (ent->v.velocity);
+                               VectorClear (ent->v.avelocity);
+                       }
+                       else
+                               ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
                }
                else
-                       ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
+               {
+                       ClipVelocity (ent->v.velocity, trace.plane.normal, ent->v.velocity, 1.0);
+                       if (trace.plane.normal[2] > 0.7)
+                       {
+                               ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
+                               ent->v.groundentity = EDICT_TO_PROG(trace.ent);
+                               VectorClear (ent->v.velocity);
+                               VectorClear (ent->v.avelocity);
+                       }
+                       else
+                               ent->v.flags = (int)ent->v.flags & ~FL_ONGROUND;
+               }
        }
 
 // check for in water