X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sv_move.c;h=6feab85de899d31c403c2d4fde261b5faf873c7b;hb=e24d834dcbcc61f28fdf0e2c1ba75693d9e23ed1;hp=8bb9b75bdc846db41f63bb122521ba944ae36573;hpb=5f9da8b90dfd4f0c86120ed01ca3e16c2dbb58e1;p=xonotic%2Fdarkplaces.git

diff --git a/sv_move.c b/sv_move.c
index 8bb9b75b..6feab85d 100644
--- a/sv_move.c
+++ b/sv_move.c
@@ -51,7 +51,7 @@ qboolean SV_CheckBottom (edict_t *ent)
 		{
 			start[0] = x ? maxs[0] : mins[0];
 			start[1] = y ? maxs[1] : mins[1];
-			if (SV_PointContents(start) != CONTENTS_SOLID)
+			if (!(SV_PointSuperContents(start) & SUPERCONTENTS_SOLID))
 				goto realcheck;
 		}
 
@@ -138,7 +138,7 @@ qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
 			if (trace.fraction == 1)
 			{
 				VectorCopy(trace.endpos, traceendpos);
-				if (((int)ent->v->flags & FL_SWIM) && SV_PointContents(traceendpos) == CONTENTS_EMPTY )
+				if (((int)ent->v->flags & FL_SWIM) && !(SV_PointSuperContents(traceendpos) & SUPERCONTENTS_LIQUIDSMASK))
 					return false;	// swim monster left water
 
 				VectorCopy (traceendpos, ent->v->origin);