Merge branch 'master' into terencehill/hud_updates

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

diff --git a/qcsrc/common/physics/movetypes/step.qc b/qcsrc/common/physics/movetypes/step.qc
index d7a2d562747ebd2aa8967daef7028fb150b6eaee..a41269f79c562122fe8f01e6745cfa7df2180748 100644 (file)
--- a/qcsrc/common/physics/movetypes/step.qc
+++ b/qcsrc/common/physics/movetypes/step.qc
@@ -1,10 +1,11 @@
+#include "step.qh"
 void _Movetype_Physics_Step(entity this, float dt) // SV_Physics_Step
 {
-       if(this.move_flags & FL_ONGROUND)
+       if(IS_ONGROUND(this))
        {
                if(this.velocity_z >= (1.0 / 32.0) && UPWARD_VELOCITY_CLEARS_ONGROUND(this))
                {
-                       this.move_flags &= ~FL_ONGROUND;
+                       UNSET_ONGROUND(this);
                        _Movetype_CheckVelocity(this);
                        _Movetype_FlyMove(this, dt, true, '0 0 0', 0);
                        _Movetype_LinkEdict(this, true);