From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 30 Apr 2008 20:53:49 +0000 (+0000)
Subject: remove weird multiplication of water friction by 1 (wet feet), 2 (swimming), 3 (subme... 
X-Git-Tag: xonotic-v0.1.0preview~2262
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3e684e6d1d850991f7cbaec3005cd2030795241;p=xonotic%2Fdarkplaces.git

remove weird multiplication of water friction by 1 (wet feet), 2 (swimming), 3 (submerged), as sv_user.c (which Quake uses) does not do that and it DOES break prediction


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

diff --git a/cl_input.c b/cl_input.c
index c1430ec4..f6124794 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -935,7 +935,7 @@ void CL_ClientMovement_Physics_Swim(cl_clientmovement_state_t *s)
 	if (s->waterjumptime <= 0)
 	{
 		// water friction
-		f = 1 - s->cmd.frametime * cl.movevars_waterfriction * s->waterlevel;
+		f = 1 - s->cmd.frametime * cl.movevars_waterfriction /* * s->waterlevel */;
 		f = bound(0, f, 1);
 		VectorScale(s->velocity, f, s->velocity);