From: FruitieX <fruitiex@gmail.com>
Date: Sun, 1 May 2011 10:44:52 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.5.0~268
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=01bfb087092f257025957a55535b777634a31790;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

Conflicts:
	qcsrc/common/constants.qh
	qcsrc/server/cl_client.qc
---

01bfb087092f257025957a55535b777634a31790
diff --cc qcsrc/common/constants.qh
index 587cc2799,64dcaa44e..53eb9eed3
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -113,7 -113,7 +113,8 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
 -const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
 +const float ENT_CLIENT_SHOWNAMES = 31;
++const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
  
  const float ENT_CLIENT_TURRET = 40;
  
diff --cc qcsrc/server/cl_client.qc
index 483f3bfbd,b3d326264..d73772b72
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2711,13 -2715,9 +2728,6 @@@ void PlayerPreThink (void
  			return;					// the think tics
  		}
  
- 		if(self.teleport_time)
- 		if(time > self.teleport_time)
- 		{
- 			self.teleport_time = 0;
- 			self.effects = self.effects - (self.effects & EF_NODRAW);
- 		}
 -		if(frametime > 0) // don't do this in cl_movement frames, just in server ticks
 -			UpdateSelectedPlayer();
--
  		//don't allow the player to turn around while game is paused!
  		if(timeoutStatus == 2) {
  			self.v_angle = self.lastV_angle;