From: Mario <mario.mario@y7mail.com>
Date: Mon, 29 Apr 2013 00:20:55 +0000 (+1000)
Subject: Fix monster color resetting when it respawns
X-Git-Tag: xonotic-v0.8.0~241^2^2~263
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af2fc3f2259ab0f9ee1d825796a1e1ecd4aace0a;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monster color resetting when it respawns
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 768c65990..e88116a4e 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -227,6 +227,8 @@ void monster_changeteam()
 	
 	if(self.team)
 		self.colormap = 1024 + (self.team - 1) * 17;
+	else
+		self.colormap = 1024;
 }
 
 void monster_die()
@@ -290,11 +292,11 @@ void ent_monster()
 		self.angles_y = ReadAngle();
 		
 		self.skin = ReadByte();
+		self.team = ReadByte();
 		
 		monster_precache(self.monsterid);
 		monster_construct();
-		self.colormap = 1024;
-		self.glowmod = '0 1 1'; 
+		monster_changeteam();
 	}
 	
 	if(sf & MSF_ANG)
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index e09fe7e81..e87ffa8a8 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -735,6 +735,7 @@ float monster_send(entity to, float sf)
 	    WriteAngle(MSG_ENTITY, self.angles_y);
 		
 		WriteByte(MSG_ENTITY, self.skin);
+		WriteByte(MSG_ENTITY, self.team);
     }
     
     if(sf & MSF_ANG)