Fix monster color resetting when it respawns

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 768c65990ac31e476e3a7deeb13bbcf89dc39f50..e88116a4e18a9cfdb7dcfa3e78d762adc35c2de4 100644 (file)
--- 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 e09fe7e81007c4162f0bb133ae4a88d92110d9da..e87ffa8a8477e18510177fe08156cdfee9540126 100644 (file)
--- 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)