From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 14 Dec 2014 11:38:29 +0000 (+1100)
Subject: Fix schrödinger's IS_ONGROUND bug
X-Git-Tag: xonotic-v0.8.1~38^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39ad43d556ac7cfcb5e34dd7c7f83c7e43dfaa68;p=xonotic%2Fxonotic-data.pk3dir.git

Fix schrödinger's IS_ONGROUND bug
It was possible for the client to report being on the ground, and the server to report being in the air
---

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index ff1aa4a21..a97d69fb9 100644
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -1513,8 +1513,8 @@ void PM_Main()
 	if (!(PHYS_INPUT_BUTTON_JUMP(self))) // !jump
 		UNSET_JUMP_HELD(self); // canjump = true
 	pmove_waterjumptime -= PHYS_INPUT_TIMELENGTH;
-	PM_ClientMovement_UpdateStatus();
 #endif
+	PM_ClientMovement_UpdateStatus();
 
 #ifdef SVQC
 	WarpZone_PlayerPhysics_FixVAngle();
diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 44d7e3ed6..2e6f476d8 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -270,8 +270,10 @@ void trigger_push_touch()
 }
 
 .vector dest;
+#ifdef SVQC
 void trigger_push_link();
 void trigger_push_updatelink();
+#endif
 void trigger_push_findtarget()
 {
 	entity t;