From: Mario <mario.mario@y7mail.com>
Date: Wed, 17 Apr 2013 07:22:01 +0000 (+1000)
Subject: Use Team_ColorRGB for monster/generator glow & radar colors
X-Git-Tag: xonotic-v0.8.0~241^2^2~374
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1f1fbd22684ed960ec8a151928a9015519de604;p=xonotic%2Fxonotic-data.pk3dir.git

Use Team_ColorRGB for monster/generator glow & radar colors
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 53292d28e..36fc3b016 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -216,33 +216,8 @@ void monster_mid2info(float _mid)
 .vector glowmod;
 void monster_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);
+	self.teamradar_color = Team_ColorRGB(self.team - 1);
 	
 	if(self.team)
 		self.colormap = 1024 + (self.team - 1) * 17;
diff --git a/qcsrc/server/generator.qc b/qcsrc/server/generator.qc
index 2aca7d432..b14ee7f2e 100644
--- a/qcsrc/server/generator.qc
+++ b/qcsrc/server/generator.qc
@@ -68,34 +68,9 @@ void generator_construct()
 
 .vector glowmod;
 void generator_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);
+	self.teamradar_color = Team_ColorRGB(self.team - 1);
 	
 	if(self.team)
 		self.colormap = 1024 + (self.team - 1) * 17;
diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index a3a707c2c..e021076db 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -638,29 +638,6 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
 
 		onslaught_updatelinks();
 	}
-	/*
-	if(self.health <= 0)
-		setmodel(self, "models/onslaught/generator_dead.md3");
-	else if(self.health < self.max_health * 0.10)
-		setmodel(self, "models/onslaught/generator_dmg9.md3");
-	else if(self.health < self.max_health * 0.20)
-		setmodel(self, "models/onslaught/generator_dmg8.md3");
-	else if(self.health < self.max_health * 0.30)
-		setmodel(self, "models/onslaught/generator_dmg7.md3");
-	else if(self.health < self.max_health * 0.40)
-		setmodel(self, "models/onslaught/generator_dmg6.md3");
-	else if(self.health < self.max_health * 0.50)
-		setmodel(self, "models/onslaught/generator_dmg5.md3");
-	else if(self.health < self.max_health * 0.60)
-		setmodel(self, "models/onslaught/generator_dmg4.md3");
-	else if(self.health < self.max_health * 0.70)
-		setmodel(self, "models/onslaught/generator_dmg3.md3");
-	else if(self.health < self.max_health * 0.80)
-		setmodel(self, "models/onslaught/generator_dmg2.md3");
-	else if(self.health < self.max_health * 0.90)
-		setmodel(self, "models/onslaught/generator_dmg1.md3");
-	setsize(self, GENERATOR_MIN, GENERATOR_MAX);
-	*/
 
 	// Throw some flaming gibs on damage, more damage = more chance for gib
 	if(random() < damage/220)