]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix being able to double jump after sliding on a slick surface
authorMario <mario.mario@y7mail.com>
Fri, 6 Mar 2020 21:10:13 +0000 (07:10 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Mar 2020 21:10:27 +0000 (07:10 +1000)
qcsrc/common/physics/player.qc

index 16cb27aeca0181d435d680fe56c69da21ccec1b9..5dce802a0461681336a592736bcad9a5248efd8c 100644 (file)
@@ -359,7 +359,7 @@ bool PlayerJump(entity this)
        }
 
        if (!doublejump)
-               if (!IS_ONGROUND(this) && !IS_ONSLICK(this))
+               if (!IS_ONGROUND(this))
                        return IS_JUMP_HELD(this);
 
        if(PHYS_TRACK_CANJUMP(this))
@@ -693,11 +693,7 @@ void PM_check_slick(entity this)
        trace_dphitq3surfaceflags = 0;
        tracebox(this.origin, this.mins, this.maxs, this.origin - '0 0 1', MOVE_NOMONSTERS, this);
        if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK)
-       {
-               if(PHYS_SLICK_APPLYGRAVITY(this))
-                       UNSET_ONGROUND(this);
                SET_ONSLICK(this);
-       }
        else
                UNSET_ONSLICK(this);
 }