Merge branch 'master' into terencehill/hud_shake_fix

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

diff --git a/qcsrc/common/physics/movetypes/toss.qc b/qcsrc/common/physics/movetypes/toss.qc
index 43b5a8a1a8e41d5dfe019fff8a686a0f32fff7ae..f515a75f9fbbb09c17bd5abc78ef07312650372d 100644 (file)
--- a/qcsrc/common/physics/movetypes/toss.qc
+++ b/qcsrc/common/physics/movetypes/toss.qc
@@ -1,4 +1,4 @@
-#include "../physics.qh"
+#include "../player.qh"
 
 void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
 {
@@ -14,7 +14,7 @@ void _Movetype_Physics_Toss(entity this, float dt)  // SV_Physics_Toss
                }
                else if (this.move_suspendedinair && wasfreed(this.move_groundentity))
                {
-                       this.move_groundentity = world;
+                       this.move_groundentity = NULL;
                        return;
                }
        }