Makefile: use `-I.`

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

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 32c2fbfa84ad95d51e4c29637612a0536b755e45..6cc47ea63a4dd37df944a492e4f2ed0f243dc1ae 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -1,11 +1,11 @@
-#include "physics.qh"
-#include "triggers/include.qh"
-#include "viewloc.qh"
+#include "player.qh"
+#include "../triggers/include.qh"
+#include "../viewloc.qh"
 
 #ifdef SVQC
 
-#include "../server/miscfunctions.qh"
-#include "triggers/trigger/viewloc.qh"
+#include <server/miscfunctions.qh>
+#include "../triggers/trigger/viewloc.qh"
 
 // client side physics
 bool Physics_Valid(string thecvar)
@@ -107,7 +107,7 @@ void PM_ClientMovement_Unstick(entity this)
        #define X(unstick_offset) \
        { \
                vector neworigin = unstick_offset + this.origin; \
-               tracebox(neworigin, PL_CROUCH_MIN, PL_CROUCH_MAX, neworigin, MOVE_NORMAL, this); \
+               tracebox(neworigin, STAT(PL_CROUCH_MIN, NULL), STAT(PL_CROUCH_MAX, NULL), neworigin, MOVE_NORMAL, this); \
                if (!trace_startsolid) \
                { \
                        setorigin(this, neworigin); \
@@ -138,7 +138,7 @@ void PM_ClientMovement_UpdateStatus(entity this, bool ground)
                // wants to stand, if currently crouching we need to check for a low ceiling first
                if (IS_DUCKED(this))
                {
-                       tracebox(this.origin, PL_MIN, PL_MAX, this.origin, MOVE_NORMAL, this);
+                       tracebox(this.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), this.origin, MOVE_NORMAL, this);
                        if (!trace_startsolid) UNSET_DUCKED(this);
                }
        }
@@ -1277,9 +1277,9 @@ bool IsFlying(entity this)
                return false;
        if(this.waterlevel >= WATERLEVEL_SWIMMING)
                return false;
-       traceline(this.origin, this.origin - '0 0 48', MOVE_NORMAL, this);
-       if(trace_fraction < 1)
-               return false;
+       //traceline(this.origin, this.origin - '0 0 48', MOVE_NORMAL, this);
+       //if(trace_fraction < 1)
+               //return false;
        return true;
 }