From: Mario <zacjardine@y7mail.com>
Date: Thu, 25 Dec 2014 10:22:26 +0000 (+1100)
Subject: Merge branch 'master' into Mario/physics
X-Git-Tag: xonotic-v0.8.1~48^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8403b890ebeeb78eee50b449260a5b10aad2725;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/physics
---

e8403b890ebeeb78eee50b449260a5b10aad2725
diff --cc qcsrc/server/cl_physics.qc
index 797226717c,900f65bc8a..dc7c62aed5
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@@ -36,18 -15,19 +36,19 @@@ float Physics_ClientOption(entity pl, s
  PlayerJump
  
  When you press the jump key
+ returns TRUE if handled
  =============
  */
- void PlayerJump (void)
+ float PlayerJump (void)
  {
  	if(self.frozen)
- 		return; // no jumping in freezetag when frozen
+ 		return TRUE; // no jumping in freezetag when frozen
  
  	if(self.player_blocked)
- 		return; // no jumping while blocked
+ 		return TRUE; // no jumping while blocked
  
  	float doublejump = FALSE;
 -	float mjumpheight = autocvar_sv_jumpvelocity;
 +	float mjumpheight = self.stat_sv_jumpvelocity;
  
  	player_multijump = doublejump;
  	player_jumpheight = mjumpheight;
@@@ -1057,10 -1045,10 +1087,10 @@@ void SV_PlayerPhysics(
  		if (time >= self.teleport_time)
  		{
  			// water acceleration
 -			PM_Accelerate(wishdir, wishspeed, wishspeed, autocvar_sv_accelerate*maxspd_mod, 1, 0, 0, 0);
 +			PM_Accelerate(wishdir, wishspeed, wishspeed, self.stat_sv_accelerate*maxspd_mod, 1, 0, 0, 0);
  		}
  	}
- 	else if ((self.items & IT_JETPACK) && self.BUTTON_HOOK && (!autocvar_g_jetpack_fuel || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.frozen)
+ 	else if (self.items & IT_USING_JETPACK)
  	{
  		//makevectors(self.v_angle_y * '0 1 0');
  		makevectors(self.v_angle);
diff --cc qcsrc/server/miscfunctions.qc
index d76ffdee4b,e6fda399e2..e0be5df290
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -489,8 -489,8 +489,9 @@@ void GetCvars(float f
  
  	GetCvars_handleFloat(s, f, autoswitch, "cl_autoswitch");
  	GetCvars_handleFloat(s, f, cvar_cl_autoscreenshot, "cl_autoscreenshot");
+ 	GetCvars_handleFloat(s, f, cvar_cl_jetpack_jump, "cl_jetpack_jump");
  	GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
 +	GetCvars_handleString(s, f, cvar_cl_physics, "cl_physics");
  	GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");
  	GetCvars_handleFloat(s, f, cvar_cl_clippedspectating, "cl_clippedspectating");
  	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);