]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix compile
authorRudolf Polzer <divverent@xonotic.org>
Thu, 22 Nov 2012 15:49:49 +0000 (16:49 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 22 Nov 2012 15:49:49 +0000 (16:49 +0100)
qcsrc/client/csqcmodel_hooks.qc
qcsrc/csqcmodellib/cl_player.qc
qcsrc/csqcmodellib/cl_player.qh

index aafa68670dc6a6c3110499d5af4b94f3dc3ba2cd..ae63e86a6b6009d35b64a4228f3b9a5c82c890a3 100644 (file)
@@ -594,8 +594,8 @@ void CSQCModel_Hook_PreDraw(float isplayer)
                        {
                                if(self.pmove_flags & PMF_ONGROUND)
                                        flg |= FL_ONGROUND;
-                               if(!(self.pmove_flags & PMF_JUMPRELEASED))
-                                       if(self.anim_prev_pmove_flags & PMF_JUMPRELEASED)
+                               if(self.pmove_flags & PMF_JUMP_HELD)
+                                       if(!(self.anim_prev_pmove_flags & PMF_JUMP_HELD))
                                                animdecide_setaction(self, ANIMACTION_JUMP, TRUE);
                                self.anim_prev_pmove_flags = self.pmove_flags;
                        }
index 4aa8fdf92cdb89886784437e1ba471ca5b8b0d49..ac9373989cf1121e92747bfa54413ff8afe2e4a1 100644 (file)
 var float autocvar_cl_movement_errorcompensation = 0;
 
 // engine stuff
-.float pmove_flags;
-float pmove_onground; // weird engine flag we shouldn't really use but have to for now
-#define PMF_JUMP_HELD 1
-#define PMF_DUCKED 4
-#define PMF_ONGROUND 8
 #define REFDEFFLAG_TELEPORTED 1
 #define REFDEFFLAG_JUMPING 2
+float pmove_onground; // weird engine flag we shouldn't really use but have to for now
 
 vector csqcplayer_origin, csqcplayer_velocity;
 float csqcplayer_sequence, player_pmflags;
index 881ad3b329bc30100cc677b0214a72dfeb9454ec..1cb42f2a5ce8383b6345546a038766ebcee7a6e8 100644 (file)
@@ -26,6 +26,12 @@ float csqcplayer_status;
 #define CSQCPLAYERSTATUS_FROMSERVER 1
 #define CSQCPLAYERSTATUS_PREDICTED 2
 
+// only ever READ these!
+.float pmove_flags;
+#define PMF_JUMP_HELD 1
+#define PMF_DUCKED 4
+#define PMF_ONGROUND 8
+
 void CSQCPlayer_SetCamera();
 float CSQCPlayer_PreUpdate();
 float CSQCPlayer_PostUpdate();