Merge branch 'master' into Mario/physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / csqcmodellib / cl_player.qc

diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc
index 1cc357f586381bc5bfa7504a932e6328634e320a..1f3017afdefd64766649fc7636b9602034b718a9 100644 (file)
--- a/qcsrc/csqcmodellib/cl_player.qc
+++ b/qcsrc/csqcmodellib/cl_player.qc
@@ -20,8 +20,8 @@
  * IN THE SOFTWARE.
  */
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qc"
-       #include "../client/Defs.qc"
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../client/defs.qh"
        #include "../common/constants.qh"
        #include "../common/stats.qh"
        #include "../common/util.qh"
@@ -40,7 +40,8 @@ float autocvar_cl_movement_errorcompensation = 0;
 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;
+float csqcplayer_sequence;
+int player_pmflags;
 float csqcplayer_moveframe;
 vector csqcplayer_predictionerroro;
 vector csqcplayer_predictionerrorv;