From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Mar 2020 21:10:13 +0000 (+1000)
Subject: Fix being able to double jump after sliding on a slick surface
X-Git-Tag: xonotic-v0.8.5~1145^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d48a8da40c731f903f7e9898677b807be1665b4f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix being able to double jump after sliding on a slick surface
---

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 16cb27aec..5dce802a0 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -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);
 }