]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Test hax
authorMario <zacjardine@y7mail.com>
Sun, 22 Feb 2015 10:49:05 +0000 (21:49 +1100)
committerMario <zacjardine@y7mail.com>
Sun, 22 Feb 2015 10:49:05 +0000 (21:49 +1100)
qcsrc/common/physics.qc
qcsrc/common/physics.qh

index c5d3df7c4b5cd93e10053411e46cfac4d779df71..ad5bc16c1888ccf092590191a91dcfa929130288 100644 (file)
@@ -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
 }
index 43ec2dea120176d4b404dd151ae0de68c79cffba..21ddcece988f6e142d11eb61cf68184156b6016e 100644 (file)
@@ -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)