don't do down traces if sitting on the floor of world (world never moves, so we can...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index b8297dd86091ce76bdbc3e690e99204d67d01a4b..09ec4653e5b7df58d5965028270fd3a8cfeb55e4 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1249,6 +1249,8 @@ void SV_Physics_Toss (edict_t *ent)
                return;
 
 // if onground, return without moving
+       if (((int)ent->v.flags & FL_ONGROUND) && ent->v.groundentity == 0)
+               return;
        /*
        if ( ((int)ent->v.flags & FL_ONGROUND) )
        {
@@ -1352,6 +1354,8 @@ void SV_Physics_Step (edict_t *ent)
                else if ((flags & FL_SWIM) && SV_PointContents(ent->v.origin) != CONTENTS_EMPTY)
                        fall = false;
        }
+       if (fall && (flags & FL_ONGROUND) && ent->v.groundentity == 0)
+               fall = false;
 
        if (fall)
        {