Merge branch 'master' into Mario/crouch

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / player.qc

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 14981df2e24364dbea70652159a981fc0ae483ca..1b80655026dcf4b2fdc00a7cf79b4bd5e628d7ed 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -119,8 +119,8 @@ void PM_ClientMovement_UpdateStatus(entity this)
        bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
        if (have_hook) {
                do_crouch = false;
-       } else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
-               do_crouch = false;
+       //} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
+               //do_crouch = false;
        } else if (PHYS_INVEHICLE(this)) {
                do_crouch = false;
        } else if (STAT(FROZEN, this)) {