From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Mar 2012 19:14:45 +0000 (+0100)
Subject: more consistent water/lava leaving physics for jump vs moveup (removes need for weird... 
X-Git-Tag: xonotic-v0.7.0~55^2~12^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94d346b767a6c568ca1b55065997aaa44f50b637;p=xonotic%2Fxonotic-data.pk3dir.git

more consistent water/lava leaving physics for jump vs moveup (removes need for weird moveup AND jump binds)
---

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 51bfc62c6..751f9c64c 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -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;
 	}