Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / cl_turrets.qc

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 2b4b2c0a43586270805d79eaa31005aa20d5ce27..3365b92029a82b7a176a516aaaf4675960c39dc5 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -8,28 +8,8 @@ void turret_remove()
 .vector glowmod;
 void turret_changeteam()
 {
-       switch(self.team - 1)
-       {
-               case NUM_TEAM_1: // Red
-                       self.glowmod = '2 0 0';
-                       self.teamradar_color = '1 0 0';
-                       break;
-
-               case NUM_TEAM_2: // Blue
-                       self.glowmod = '0 0 2';
-                       self.teamradar_color = '0 0 1';
-                       break;
-
-               case NUM_TEAM_3: // Yellow
-                       self.glowmod = '1 1 0';
-                       self.teamradar_color = '1 1 0';
-                       break;
-
-               case NUM_TEAM_4: // Pink
-                       self.glowmod = '1 0 1';
-                       self.teamradar_color = '1 0 1';
-                       break;
-       }
+       self.glowmod = Team_ColorRGB(self.team - 1) * 2;
+       self.teamradar_color = Team_ColorRGB(self.team - 1);
 
        if(self.team)
                self.colormap = 1024 + (self.team - 1) * 17;