From af2fc3f2259ab0f9ee1d825796a1e1ecd4aace0a Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 29 Apr 2013 10:20:55 +1000 Subject: [PATCH] Fix monster color resetting when it respawns --- qcsrc/client/monsters.qc | 6 ++++-- qcsrc/server/monsters/lib/monsters.qc | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) 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) -- 2.39.2