Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'

Conflicts:
	qcsrc/server/cl_client.qc

diff --cc qcsrc/server/cl_client.qc
index 7c3308041e670a8270eca36b9a660a640746a6e0,33b763cc3d201d68131adb64f37bab7d4e0eb290..391bff6829be36236d585090d5a5b0392218728a
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2799,8 -2782,7 +2799,8 @@@ void PlayerPreThink (void
  
                self.prevorigin = self.origin;
  
 -              if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && !self.freezetag_frozen && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack
 +              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)
                        {

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_freezetag.qc
Simple merge