this commit adds video mode switching, and preferred mode is saved to config, no...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 724d45bdb66a307ef3d321ac8fca92ed0b5c4e91..b89e114dfe21ef2cd8f4c145e069f9e2e4326df1 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -771,18 +771,18 @@ qboolean SV_CheckWater (edict_t *ent)
 
        ent->v.waterlevel = 0;
        ent->v.watertype = CONTENTS_EMPTY;
-       cont = Mod_PointInLeaf(point, sv.worldmodel)->contents;
+       cont = Mod_PointContents(point, sv.worldmodel);
        if (cont <= CONTENTS_WATER)
        {
                ent->v.watertype = cont;
                ent->v.waterlevel = 1;
                point[2] = ent->v.origin[2] + (ent->v.mins[2] + ent->v.maxs[2])*0.5;
-               cont = Mod_PointInLeaf(point, sv.worldmodel)->contents;
+               cont = Mod_PointContents(point, sv.worldmodel);
                if (cont <= CONTENTS_WATER)
                {
                        ent->v.waterlevel = 2;
                        point[2] = ent->v.origin[2] + ent->v.view_ofs[2];
-                       cont = Mod_PointInLeaf(point, sv.worldmodel)->contents;
+                       cont = Mod_PointContents(point, sv.worldmodel);
                        if (cont <= CONTENTS_WATER)
                                ent->v.waterlevel = 3;
                }
@@ -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);
@@ -1137,8 +1135,8 @@ SV_CheckWaterTransition
 */
 void SV_CheckWaterTransition (edict_t *ent)
 {
-       int             cont;
-       cont = Mod_PointInLeaf(ent->v.origin, sv.worldmodel)->contents;
+       int cont;
+       cont = Mod_PointContents(ent->v.origin, sv.worldmodel);
        if (!ent->v.watertype)
        {
                // just spawned here
@@ -1149,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);
 
@@ -1158,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);
 
@@ -1194,7 +1192,10 @@ void SV_Physics_Toss (edict_t *ent)
                // and groundentity is now freed, set groundentity to 0 (floating)
                groundentity = PROG_TO_EDICT(ent->v.groundentity);
                if (groundentity->v.solid == SOLID_BSP)
+               {
                        ent->suspendedinairflag = true;
+                       return;
+               }
                else if (ent->suspendedinairflag && groundentity->free)
                {
                        // leave it suspended in the air
@@ -1290,7 +1291,7 @@ void SV_Physics_Step (edict_t *ent)
        {
                if (flags & FL_FLY)
                        fall = false;
-               else if ((flags & FL_SWIM) && Mod_PointInLeaf(ent->v.origin, sv.worldmodel)->contents != CONTENTS_EMPTY)
+               else if ((flags & FL_SWIM) && Mod_PointContents(ent->v.origin, sv.worldmodel) != CONTENTS_EMPTY)
                        fall = false;
        }
        if (fall && (flags & FL_ONGROUND) && ent->v.groundentity == 0)