Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:43:12 +0000 (21:43 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:43:12 +0000 (21:43 +0200)
Conflicts:
qcsrc/server/cl_client.qc

1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/gamemode_freezetag.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)
                        {
Simple merge