From: Mario <zacjardine@y7mail.com>
Date: Sun, 22 Feb 2015 10:49:05 +0000 (+1100)
Subject: Test hax
X-Git-Tag: xonotic-v0.8.1~38^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a37826300e6ea1f6bf1947575c10bb8930f25d9e;p=xonotic%2Fxonotic-data.pk3dir.git

Test hax
---

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index c5d3df7c4..ad5bc16c1 100644
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -1931,7 +1931,6 @@ void CSQC_ClientMovement_PlayerMove_Frame(void)
 	PM_Main();
 
 #ifdef CSQC
-	pmove_org = self.origin;
-	pmove_vel = self.velocity;
+	self.pmove_flags = self.pm_flags;
 #endif
 }
diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index 43ec2dea1..21ddcece9 100644
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -26,6 +26,8 @@ bool IsFlying(entity a);
 
 #ifdef CSQC
 
+	.int pm_flags;
+
 	float PM_multijump_checkjump();
 	void PM_multijump();
 
@@ -69,23 +71,23 @@ bool IsFlying(entity a);
 	#define GAMEPLAYFIX_Q2AIRACCELERATE				cvar("sv_gameplayfix_q2airaccelerate")
 	#define GAMEPLAYFIX_EASIERWATERJUMP 			getstati(STAT_GAMEPLAYFIX_EASIERWATERJUMP)
 
-	#define IS_DUCKED(s)    					!!(s.pmove_flags & PMF_DUCKED)
-	#define SET_DUCKED(s)   					s.pmove_flags |= PMF_DUCKED
-	#define UNSET_DUCKED(s) 					s.pmove_flags &= ~PMF_DUCKED
+	#define IS_DUCKED(s)    					!!(s.pm_flags & PMF_DUCKED)
+	#define SET_DUCKED(s)   					s.pm_flags |= PMF_DUCKED
+	#define UNSET_DUCKED(s) 					s.pm_flags &= ~PMF_DUCKED
 
-	#define IS_JUMP_HELD(s)    					!!(s.pmove_flags & PMF_JUMP_HELD)
-	#define SET_JUMP_HELD(s)   					s.pmove_flags |= PMF_JUMP_HELD
-	#define UNSET_JUMP_HELD(s) 					s.pmove_flags &= ~PMF_JUMP_HELD
+	#define IS_JUMP_HELD(s)    					!!(s.pm_flags & PMF_JUMP_HELD)
+	#define SET_JUMP_HELD(s)   					s.pm_flags |= PMF_JUMP_HELD
+	#define UNSET_JUMP_HELD(s) 					s.pm_flags &= ~PMF_JUMP_HELD
 
-	#define IS_ONGROUND(s)    					!!(s.pmove_flags & PMF_ONGROUND)
-	#define SET_ONGROUND(s)   					s.pmove_flags |= PMF_ONGROUND
-	#define UNSET_ONGROUND(s) 					s.pmove_flags &= ~PMF_ONGROUND
+	#define IS_ONGROUND(s)    					!!(s.pm_flags & PMF_ONGROUND)
+	#define SET_ONGROUND(s)   					s.pm_flags |= PMF_ONGROUND
+	#define UNSET_ONGROUND(s) 					s.pm_flags &= ~PMF_ONGROUND
 
 	#define WAS_ONGROUND(s)						!!(s.lastflags & PMF_ONGROUND)
 
 	#define ITEMS(s) 							getstati(STAT_ITEMS, 0, 24)
 
-	#define FLAGS(s)							(s).pmove_flags
+	#define FLAGS(s)							(s).pm_flags
 
 	#define PHYS_AMMO_FUEL(s)					getstati(STAT_FUEL)