From cdc3772a8810ac9a19c38f8d6dec9576852652a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C4=81nis=20R=C5=ABcis?= <parasti@gmail.com>
Date: Wed, 26 May 2010 20:27:42 +0300
Subject: [PATCH] Clean up doublejump code

---
 qcsrc/server/cl_physics.qc | 19 ++++++++++---------
 qcsrc/server/t_jumppads.qc |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index d3425451c1..c0aa4ffb1f 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -41,6 +41,15 @@ When you press the jump key
 void PlayerJump (void)
 {
 	float mjumpheight;
+	float doublejump;
+
+	doublejump = FALSE;
+	if (sv_doublejump)
+	{
+		tracebox(self.origin + '0 0 0.01', self.mins, self.maxs, self.origin - '0 0 0.01', MOVE_NORMAL, self);
+		if (trace_fraction < 1 && trace_plane_normal_z > 0.7)
+			doublejump = TRUE;
+	}
 
 	mjumpheight = cvar("sv_jumpvelocity");
 	if (self.waterlevel >= WATERLEVEL_SWIMMING)
@@ -55,6 +64,7 @@ void PlayerJump (void)
 		return;
 	}
 
+	if (!doublejump)
 	if (!(self.flags & FL_ONGROUND))
 		return;
 
@@ -605,7 +615,6 @@ void race_send_speedaward_alltimebest(float msg)
 string GetMapname(void);
 float speedaward_lastupdate;
 float speedaward_lastsent;
-.float jumppadusetime;
 var float autocvar_g_movement_highspeed = 1;
 void SV_PlayerPhysics()
 {
@@ -859,14 +868,6 @@ void SV_PlayerPhysics()
 
 	if(self.classname == "player")
 	{
-		if(sv_doublejump && time - self.jumppadusetime > 2 * sys_frametime)
-		{
-			tracebox(self.origin + '0 0 0.01', self.mins, self.maxs, self.origin - '0 0 0.01', MOVE_NORMAL, self);
-			self.flags &~= FL_ONGROUND;
-			if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
-				self.flags |= FL_ONGROUND;
-		}
-
 		if (self.BUTTON_JUMP)
 			PlayerJump ();
 		else
diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 4faba6d71c..9bb8f7c920 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -152,7 +152,6 @@ void trigger_push_touch()
 	other.flags &~= FL_ONGROUND;
 
 	other.velocity = self.movedir;
-	other.jumppadusetime = time;
 
 	if (other.classname == "player")
 	{
-- 
2.39.2