From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 9 Jan 2012 18:16:54 +0000 (+0100)
Subject: respawn ghosts: don't munge colormap
X-Git-Tag: xonotic-v0.6.0~188^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8efc934724446a2c4506435a2a421a51d40fc20d;p=xonotic%2Fxonotic-data.pk3dir.git

respawn ghosts: don't munge colormap
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 78bffdc9e..e5f6a7b36 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1752,7 +1752,6 @@ void UpdateChatBubble()
 	else self.colormod = '1 1 1';
 }*/
 
-.float oldcolormap;
 void respawn(void)
 {
 	if(self.alpha >= 0 && autocvar_g_respawn_ghosts)
@@ -1763,20 +1762,14 @@ void respawn(void)
 		self.velocity = '0 0 1' * autocvar_g_respawn_ghosts_speed;
 		self.avelocity = randomvec() * autocvar_g_respawn_ghosts_speed * 3 - randomvec() * autocvar_g_respawn_ghosts_speed * 3;
 		self.effects |= EF_ADDITIVE;
-		self.oldcolormap = self.colormap;
-		self.colormap = 0; // this originally was 512, but raises a warning in the engine, so get rid of it
 		pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1);
 		if(autocvar_g_respawn_ghosts_maxtime)
 			SUB_SetFade (self, time + autocvar_g_respawn_ghosts_maxtime / 2 + random () * (autocvar_g_respawn_ghosts_maxtime - autocvar_g_respawn_ghosts_maxtime / 2), 1.5);
 	}
 
 	CopyBody(1);
+
 	self.effects |= EF_NODRAW; // prevent another CopyBody
-	if(self.oldcolormap)
-	{
-		self.colormap = self.oldcolormap;
-		self.oldcolormap = 0;
-	}
 	PutClientInServer();
 }