From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sun, 28 Mar 2010 18:51:56 +0000 (+0200)
Subject: Merge commit 'origin/diabolik/iqmsupport'
X-Git-Tag: xonotic-v0.1.0preview~674
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f59a071b441a5467f71532fbace066ccae9137a4;hp=-c

Merge commit 'origin/diabolik/iqmsupport'
---

f59a071b441a5467f71532fbace066ccae9137a4
diff --combined qcsrc/server/cl_client.qc
index 0b6f3fd0b1,17b3f623a8..ef83ef6354
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -13,13 -13,10 +13,13 @@@ void Announce(string snd) 
  }
  
  void AnnounceTo(entity e, string snd) {
 -	msg_entity = e;
 -	WriteByte(MSG_ONE, SVC_TEMPENTITY);
 -	WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);
 -	WriteString(MSG_ONE, snd);
 +	if (clienttype(e) == CLIENTTYPE_REAL)
 +	{
 +		msg_entity = e;
 +		WriteByte(MSG_ONE, SVC_TEMPENTITY);
 +		WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);
 +		WriteString(MSG_ONE, snd);
 +	}
  }
  
  float ClientData_Send(entity to, float sf)
@@@ -408,6 -405,7 +408,7 @@@ string CheckPlayerModel(string plyermod
  	{
  		if(substring(plyermodel,-4,4) != ".zym")
  		if(substring(plyermodel,-4,4) != ".dpm")
+ 		if(substring(plyermodel,-4,4) != ".iqm")
  		if(substring(plyermodel,-4,4) != ".md3")
  		if(substring(plyermodel,-4,4) != ".psk")
  			return FallbackPlayerModel;
@@@ -2052,7 -2050,6 +2053,7 @@@ void SetZoomState(float z
  }
  
  void GetPressedKeys(void) {
 +	MUTATOR_CALLHOOK(GetPressedKeys);
  	if (self.movement_x > 0) // get if movement keys are pressed
  	{	// forward key pressed
  		self.pressedkeys |= KEY_FORWARD;
@@@ -2530,7 -2527,8 +2531,7 @@@ void PlayerPreThink (void
  
  		if(frametime)
  		{
 -			if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
 -				self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
 +			self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
  			player_powerups();
  		}
  
@@@ -2850,6 -2848,7 +2851,6 @@@ void PlayerPostThink (void
  			ImpulseCommands();
  		if (intermission_running)
  			return;		// intermission or finale
 -
  		GetPressedKeys();
  	} else if (self.classname == "observer") {
  		//do nothing