Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics.qh

diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh
index 9612f0cfb9d33663bb97c984a7ae061a79545c0f..c256a9eb10aed7456c3f02307e74af036302dd10 100644 (file)
--- a/qcsrc/common/physics.qh
+++ b/qcsrc/common/physics.qh
@@ -24,15 +24,15 @@ float AdjustAirAccelQW(float accelqw, float factor);
 
 #ifdef CSQC
 
-       #include "../server/t_jumppads.qh"
-
        float PM_multijump_checkjump();
        void PM_multijump();
-    .float speed;
-    .float watertype;
-    .float jumppadcount;
-    .float ladder_time;
-    .entity ladder_entity;
+
+       .float watertype;
+
+// TODO
+       #define IS_CLIENT(s)                                            (s).isplayermodel
+       #define IS_PLAYER(s)                                            (s).isplayermodel
+       #define isPushable(s)                                           (s).isplayermodel
 
        float player_multijump;
        float player_jumpheight;