From bdd9f0a92f7481daee4086d64c9c4d130d35b898 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 2 Sep 2004 13:16:31 +0000
Subject: [PATCH] being glued to the floor while swimming = bad

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4418 d7cf8633-e32d-0410-b094-e92efae38249
---
 sv_phys.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sv_phys.c b/sv_phys.c
index b25bc527..1b9a8528 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1025,6 +1025,12 @@ void SV_WalkMove (edict_t *ent)
 	originalmove_flags = (int)ent->v->flags;
 	originalmove_groundentity = ent->v->groundentity;
 
+	if ((int)ent->v->flags & FL_WATERJUMP)
+		return;
+
+	if (sv_nostep.integer)
+		return;
+	
 	// if move didn't block on a step, return
 	if (clip & 2)
 	{
@@ -1032,12 +1038,6 @@ void SV_WalkMove (edict_t *ent)
 		if (fabs(start_velocity[0]) < 0.03125 && fabs(start_velocity[1]) < 0.03125)
 			return;
 	
-		if (sv_nostep.integer)
-			return;
-		
-		if ((int)ent->v->flags & FL_WATERJUMP)
-			return;
-	
 		if (ent->v->movetype != MOVETYPE_FLY)
 		{
 			// return if gibbed by a trigger
@@ -1092,7 +1092,7 @@ void SV_WalkMove (edict_t *ent)
 		if (clip & 2 && sv_wallfriction.integer)
 			SV_WallFriction (ent, stepnormal);
 	}
-	else if (!sv_gameplayfix_stepdown.integer || !oldonground || ((int)ent->v->flags & FL_ONGROUND))
+	else if (!sv_gameplayfix_stepdown.integer || !oldonground || ((int)ent->v->flags & FL_ONGROUND) || ent->v->waterlevel >= 2)
 		return;
 
 	// move down
-- 
2.39.2