From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 23 Aug 2012 19:43:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'
X-Git-Tag: xonotic-v0.7.0~269
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8dd9e564bf844bd71312218ce4714e6324d6beb5;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/cl_client.qc
---

8dd9e564bf844bd71312218ce4714e6324d6beb5
diff --cc qcsrc/server/cl_client.qc
index 7c3308041,33b763cc3..391bff682
--- a/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)
  			{