From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 1 May 2008 07:47:10 +0000 (+0000)
Subject: re-add the multiplication by waterlevel for cls.protocol == PROTOCOL_QUAKEWORLD
X-Git-Tag: xonotic-v0.1.0preview~2261
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd2eb80cd2b36db6ab6539c3cb5687d60d186f0d;p=xonotic%2Fdarkplaces.git

re-add the multiplication by waterlevel for cls.protocol == PROTOCOL_QUAKEWORLD


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

diff --git a/cl_input.c b/cl_input.c
index f6124794..f5506ca0 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 * (cls.protocol == PROTOCOL_QUAKEWORLD ? s->waterlevel : 1);
 		f = bound(0, f, 1);
 		VectorScale(s->velocity, f, s->velocity);