From: Mario <mario@smbclan.net>
Date: Thu, 3 Dec 2015 14:26:19 +0000 (+1000)
Subject: Revert to the old method in hopes to catch a command spam issue
X-Git-Tag: xonotic-v0.8.2~1571
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=473e9d4b51ee62f70a2196c10e11c93183a22453;p=xonotic%2Fxonotic-data.pk3dir.git

Revert to the old method in hopes to catch a command spam issue
---

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index 01a8770a5..2cf5a124c 100644
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -91,6 +91,9 @@ bool IsFlying(entity a);
 
 #ifdef CSQC
 
+	string autocvar_cl_jumpspeedcap_min;
+	string autocvar_cl_jumpspeedcap_max;
+
 	noref float pmove_waterjumptime;
 
 	const int FL_WATERJUMP = 2048;	// player jumping out of water
@@ -163,8 +166,8 @@ bool IsFlying(entity a);
 
 	#define ITEMS_STAT(s) 						(s).items
 
-	#define PHYS_JUMPSPEEDCAP_MIN				cvar_string("cl_jumpspeedcap_min")
-	#define PHYS_JUMPSPEEDCAP_MAX				cvar_string("cl_jumpspeedcap_max")
+	#define PHYS_JUMPSPEEDCAP_MIN				autocvar_cl_jumpspeedcap_min
+	#define PHYS_JUMPSPEEDCAP_MAX				autocvar_cl_jumpspeedcap_max
 
 	#define PHYS_CL_TRACK_CANJUMP(s)            STAT(MOVEVARS_CL_TRACK_CANJUMP, s)
 	// FIXME: 0 doesn't mean zero gravity
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e63a9afbc..06d5f05ec 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2491,6 +2491,8 @@ void PlayerPreThink ()
 	if(self.spectatee_status != oldspectatee_status)
 	{
 		ClientData_Touch(self);
+		if(g_race || g_cts)
+			race_InitSpectator();
 	}
 
 	if(self.teamkill_soundtime)
diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/server/mutators/mutator/gamemode_cts.qc
index e72d898ce..d6dc0f318 100644
--- a/qcsrc/server/mutators/mutator/gamemode_cts.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc
@@ -217,16 +217,6 @@ MUTATOR_HOOKFUNCTION(cts, reset_map_global)
 	return false;
 }
 
-MUTATOR_HOOKFUNCTION(cts, PlayerPreThink)
-{SELFPARAM();
-	if(IS_SPEC(self) || IS_OBSERVER(self))
-	if(g_race_qualifying)
-	if(msg_entity.enemy.race_laptime)
-		race_SendNextCheckpoint(msg_entity.enemy, 1);
-
-	return false;
-}
-
 MUTATOR_HOOKFUNCTION(cts, ClientConnect)
 {SELFPARAM();
 	race_PreparePlayer();
diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index b3075910c..124bc653a 100644
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -253,16 +253,6 @@ MUTATOR_HOOKFUNCTION(rc, reset_map_global)
 	return false;
 }
 
-MUTATOR_HOOKFUNCTION(rc, PlayerPreThink)
-{SELFPARAM();
-	if(IS_SPEC(self) || IS_OBSERVER(self))
-	if(g_race_qualifying)
-	if(msg_entity.enemy.race_laptime)
-		race_SendNextCheckpoint(msg_entity.enemy, 1);
-
-	return false;
-}
-
 MUTATOR_HOOKFUNCTION(rc, ClientConnect)
 {SELFPARAM();
 	race_PreparePlayer();
diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 093946d97..304022f8e 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -15,6 +15,13 @@
 #include "../lib/warpzone/common.qh"
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
 
+void race_InitSpectator()
+{
+	if(g_race_qualifying)
+		if(msg_entity.enemy.race_laptime)
+			race_SendNextCheckpoint(msg_entity.enemy, 1);
+}
+
 void W_Porto_Fail(float failhard);
 
 float race_readTime(string map, float pos)
diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh
index 03e8a54ab..c78c7765b 100644
--- a/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@ -57,4 +57,6 @@ void race_SendRankings(float pos, float prevpos, float del, float msg);
 
 void race_RetractPlayer();
 
+void race_InitSpectator();
+
 #endif