From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Mar 2020 21:12:59 +0000 (+1000)
Subject: Apply air movement physics on slick surfaces when sv_slick_applygravity is enabled
X-Git-Tag: xonotic-v0.8.5~1145^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=265179b9de7cd25a2c4375434b6b9568e362c866;p=xonotic%2Fxonotic-data.pk3dir.git

Apply air movement physics on slick surfaces when sv_slick_applygravity is enabled
---

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index a5af98d2c..b9eca8ca8 100644
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -126,7 +126,7 @@ void sys_phys_update(entity this, float dt)
 		this.com_phys_gravity = '0 0 0';
 	} else if (ITEMS_STAT(this) & IT_USING_JETPACK) {
 		PM_jetpack(this, maxspeed_mod, dt);
-	} else if (IS_ONGROUND(this)) {
+	} else if (IS_ONGROUND(this) && (!IS_ONSLICK(this) || !PHYS_SLICK_APPLYGRAVITY(this))) {
 		if (!WAS_ONGROUND(this)) {
 			emit(phys_land, this);
 			if (this.lastground < time - 0.3) {