]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add an extra option to wallclipping to not need downward velocity
authorMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 23:57:09 +0000 (09:57 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 23:57:09 +0000 (09:57 +1000)
qcsrc/common/physics/movetypes/walk.qc
qcsrc/common/stats.qh

index 8ac2516180b55726d396d96c3512e23f811c562c..6e4c548d6cd8aecdd2ced19a27d7f31b406524bf 100644 (file)
@@ -53,7 +53,7 @@ void _Movetype_Physics_Walk(entity this, float dt)  // SV_WalkMove
        // if the move did not hit the ground at any point, we're not on ground
        if (!(clip & 1))
                UNSET_ONGROUND(this);
-       else if(PHYS_WALLCLIP(this) && !this.groundentity && start_velocity.z < -200) // don't do landing time if we were just going down a slope
+       else if(PHYS_WALLCLIP(this) && !this.groundentity && (PHYS_WALLCLIP(this) == 2 || start_velocity.z < -200)) // don't do landing time if we were just going down a slope
                this.pm_time = 0.25;
 
        _Movetype_CheckVelocity(this);
index 91548ccdf1a0cf2a663109a052deeb3168310092..cf51ea66b3ebf7b24d86c16c89756347fa5bca0c 100644 (file)
@@ -366,9 +366,9 @@ REGISTER_STAT(MOVEVARS_AIRACCEL_QW, float)
 REGISTER_STAT(MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION, float)
 REGISTER_STAT(MOVEVARS_SPECIALCOMMAND, bool)
 #ifdef SVQC
-bool autocvar_sv_wallclip;
+int autocvar_sv_wallclip;
 #endif
-REGISTER_STAT(MOVEVARS_WALLCLIP, bool, autocvar_sv_wallclip)
+REGISTER_STAT(MOVEVARS_WALLCLIP, int, autocvar_sv_wallclip)
 
 
 #ifdef CSQC