From: Mario <mario@smbclan.net>
Date: Mon, 27 Jun 2016 01:30:04 +0000 (+1000)
Subject: sv_gameplayfix_gravityunaffectedbyticrate isn't used by the engine, don't use it... 
X-Git-Tag: xonotic-v0.8.2~700^2~121^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6b530e84d5a5499f33282211cd421e643353fab;p=xonotic%2Fxonotic-data.pk3dir.git

sv_gameplayfix_gravityunaffectedbyticrate isn't used by the engine, don't use it here
---

diff --git a/qcsrc/common/physics/movetypes/toss.qc b/qcsrc/common/physics/movetypes/toss.qc
index f515a75f9..5bea38c5b 100644
--- a/qcsrc/common/physics/movetypes/toss.qc
+++ b/qcsrc/common/physics/movetypes/toss.qc
@@ -23,13 +23,19 @@ void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
 
 	_Movetype_CheckVelocity(this);
 
-	if (this.move_movetype == MOVETYPE_BOUNCE || this.move_movetype == MOVETYPE_TOSS)
+	/*if (this.move_movetype == MOVETYPE_BOUNCE || this.move_movetype == MOVETYPE_TOSS)
 	{
 		this.move_didgravity = 1;
 		this.move_velocity_z -= (GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE ? 0.5 : 1)
 		    * dt
 		    * (this.gravity ? this.gravity : 1)
 		    * PHYS_GRAVITY(this);
+	}*/
+
+	if (this.move_movetype == MOVETYPE_BOUNCE || this.move_movetype == MOVETYPE_TOSS)
+	{
+		this.move_didgravity = true;
+		this.move_velocity_z -= (((this.gravity) ? this.gravity : 1) * PHYS_GRAVITY(this) * dt);
 	}
 
 	this.move_angles = this.move_angles + this.move_avelocity * dt;
@@ -108,8 +114,8 @@ void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
 			break;
 	}
 
-	if (GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE && this.move_didgravity > 0 && !(this.move_flags & FL_ONGROUND))
-		this.move_velocity_z -= 0.5 * dt * (this.gravity ? this.gravity : 1) * PHYS_GRAVITY(this);
+	//if (GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE && this.move_didgravity > 0 && !(this.move_flags & FL_ONGROUND))
+	//	this.move_velocity_z -= 0.5 * dt * (this.gravity ? this.gravity : 1) * PHYS_GRAVITY(this);
 
 	_Movetype_CheckWaterTransition(this);
 }