Merge branch 'terencehill/menu_fixes' into 'master'

[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 541e9d61e0819c1baa38047ae4ff39d142467a51..41ada953d59a9a137a5a2144b3e53a68faee020d 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -1295,10 +1295,6 @@ bool IsFlying(entity this)
        return true;
 }
 
-#ifdef CSQC
-float autocvar_slowmo;
-#endif
-
 void PM_Main(entity this)
 {
        int buttons = PHYS_INPUT_BUTTON_MASK(this);
@@ -1332,9 +1328,6 @@ void PM_Main(entity this)
        if (this.PlayerPhysplug)
                if (this.PlayerPhysplug(this))
                        return;
-#elif defined(CSQC)
-       if(autocvar_slowmo != STAT(MOVEVARS_TIMESCALE))
-               cvar_set("slowmo", ftos(STAT(MOVEVARS_TIMESCALE)));
 #endif
 
 #ifdef SVQC
@@ -1391,7 +1384,7 @@ void PM_Main(entity this)
                return;
 
        // when we get here, disableclientprediction cannot be 2
-       this.disableclientprediction = -1;
+       this.disableclientprediction = 0;
 #endif
 
        viewloc_PlayerPhysics(this);