]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
re-add the multiplication by waterlevel for cls.protocol == PROTOCOL_QUAKEWORLD
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 1 May 2008 07:47:10 +0000 (07:47 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 1 May 2008 07:47:10 +0000 (07:47 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8269 d7cf8633-e32d-0410-b094-e92efae38249

cl_input.c

index f6124794e155787f6f53e68480b94150af4c5fad..f5506ca0f7be572899b40f4fc967e7930ed8d3cd 100644 (file)
@@ -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);