]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply air movement physics on slick surfaces when sv_slick_applygravity is enabled
authorMario <mario.mario@y7mail.com>
Fri, 6 Mar 2020 21:12:59 +0000 (07:12 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Mar 2020 21:12:59 +0000 (07:12 +1000)
qcsrc/ecs/systems/physics.qc

index a5af98d2ce9ac5ce8ee5a5d2c9abffa10f35da95..b9eca8ca8e971859d2385633cad132de62ee1fd7 100644 (file)
@@ -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) {