From: Mario <mario.mario@y7mail.com>
Date: Sat, 31 Aug 2013 16:31:01 +0000 (+1000)
Subject: Fix colors in non teamplay
X-Git-Tag: xonotic-v0.8.0~241^2^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=545ad462d536d474e42e5f1171a2851ea54d4c33;p=xonotic%2Fxonotic-data.pk3dir.git

Fix colors in non teamplay
---

diff --git a/qcsrc/common/monsters/cl_monsters.qc b/qcsrc/common/monsters/cl_monsters.qc
index 40f5e22ac..0171de220 100644
--- a/qcsrc/common/monsters/cl_monsters.qc
+++ b/qcsrc/common/monsters/cl_monsters.qc
@@ -7,12 +7,17 @@
 void monster_changeteam()
 {
 	self.glowmod = Team_ColorRGB(self.team - 1);
-	self.teamradar_color = Team_ColorRGB(self.team - 1);
 	
 	if(self.team)
+	{
+		self.teamradar_color = Team_ColorRGB(self.team - 1);
 		self.colormap = 1024 + (self.team - 1) * 17;
+	}
 	else
+	{
+		self.teamradar_color = '1 0 0';
 		self.colormap = 1024;
+	}
 }
 
 void monster_die()
@@ -46,7 +51,7 @@ void monster_draw2d()
 	if(dist < 10240 && t != self.team)
 	{
 		// TODO: Vehicle tactical hud
-		o = project_3d_to_2d(self.origin + '0 0 1' * (self.maxs_z + 10));
+		o = project_3d_to_2d(self.origin + '0 0 1' * ((self.maxs_z + self.mins_z) * 0.5));
 		if(o_z < 0 
 		|| o_x < (vid_conwidth * waypointsprite_edgeoffset_left) 
 		|| o_y < (vid_conheight * waypointsprite_edgeoffset_top)