From: Mario <mario@smbclan.net>
Date: Wed, 2 Dec 2015 00:41:17 +0000 (+1000)
Subject: Fix it more cleanly
X-Git-Tag: xonotic-v0.8.2~1587
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0489b5f762a775b7b5bbe536531cefdc01a8fd7;p=xonotic%2Fxonotic-data.pk3dir.git

Fix it more cleanly
---

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index 9c1bed68f..0169011c0 100644
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -55,8 +55,6 @@ bool IsFlying(entity a);
 
 #define PHYS_FROZEN(s)                      STAT(FROZEN, s)
 
-#define PHYS_GRAVITY(s)                     STAT(MOVEVARS_GRAVITY, s)
-
 #define PHYS_HIGHSPEED                      STAT(MOVEVARS_HIGHSPEED, this)
 
 #define PHYS_JETPACK_ACCEL_SIDE 			STAT(JETPACK_ACCEL_SIDE, this)
@@ -113,6 +111,8 @@ bool IsFlying(entity a);
 	//float player_multijump;
 	//float player_jumpheight;
 
+	#define PHYS_GRAVITY(s)                     STAT(MOVEVARS_GRAVITY, s)
+
 	#define PHYS_TELEPORT_TIME(s)				pmove_waterjumptime
 
 	#define TICRATE ticrate
@@ -181,6 +181,8 @@ bool IsFlying(entity a);
 
 	#define PHYS_TELEPORT_TIME(s)				s.teleport_time
 
+	#define PHYS_GRAVITY(s)                     autocvar_sv_gravity
+
 	#define TICRATE sys_frametime
 
 	#define PHYS_INPUT_ANGLES(s)				s.v_angle
diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index 758ab9e80..ea3170a24 100644
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -37,11 +37,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 
 	torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5;
 
-#ifdef SVQC
-	grav = autocvar_sv_gravity;
-#elif defined(CSQC)
 	grav = PHYS_GRAVITY(other);
-#endif
 	if(PHYS_ENTGRAVITY(other))
 		grav *= PHYS_ENTGRAVITY(other);