Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc
index 7c3308041e670a8270eca36b9a660a640746a6e0..391bff6829be36236d585090d5a5b0392218728a 100644 (file)
@@ -2800,7 +2800,7 @@ void PlayerPreThink (void)
                self.prevorigin = self.origin;
 
                if (!self.vehicle)
-               if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack
+               if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x && !self.freezetag_frozen) // prevent crouching if using melee attack
                {
                        if (!self.crouch)
                        {