cleaned up SV_Physics_Toss a bit - particularly water transitions and floating items

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1941 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sv_phys.c b/sv_phys.c
index 0d89b119fa0dd04482e3406947f06dbdbaebfdf5..724d45bdb66a307ef3d321ac8fca92ed0b5c4e91 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1187,12 +1187,15 @@ 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))
+               else if (ent->suspendedinairflag && groundentity->free)
                {
                        // leave it suspended in the air
                        ent->v.groundentity = 0;
@@ -1205,9 +1208,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
@@ -1218,40 +1219,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