X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=4a873e2d0eb70bc6310703903b0bcc04f28fad43;hb=2bb2db9c0f8016645a23381d7493588d748ecacf;hp=a929e368c184f3f1a0ea6431318ac5a96c772de8;hpb=2be39968eee26eaafc1099e9d72ccb2066b8414e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index a929e368c..4a873e2d0 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;
 	}
 
@@ -704,8 +698,6 @@ void SV_PlayerPhysics()
 	WarpZone_PlayerPhysics_FixVAngle();
 	
 	maxspd_mod = 1;
-	if(g_minstagib && (self.items & IT_INVINCIBLE))
-		maxspd_mod *= autocvar_g_minstagib_speed_highspeed;
 	if(self.ballcarried)
 		if(g_nexball)
 			maxspd_mod *= autocvar_g_nexball_basketball_carrier_highspeed;