]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
more consistent water/lava leaving physics for jump vs moveup (removes need for weird...
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Mar 2012 19:14:45 +0000 (20:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Mar 2012 19:14:45 +0000 (20:14 +0100)
qcsrc/server/cl_physics.qc

index 51bfc62c6382a3fcf3c64e5aa22e4ebb8812c654..751f9c64ca72ddb8c8a1d4a586efd0e3ba284e0c 100644 (file)
@@ -48,13 +48,7 @@ void PlayerJump (void)
        mjumpheight = autocvar_sv_jumpvelocity;
        if (self.waterlevel >= WATERLEVEL_SWIMMING)
        {
-               if (self.watertype == CONTENT_WATER)
-                       self.velocity_z = 200;
-               else if (self.watertype == CONTENT_SLIME)
-                       self.velocity_z = 80;
-               else
-                       self.velocity_z = 50;
-
+               self.velocity_z = self.stat_sv_maxspeed * 0.7;
                return;
        }