X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_onslaught.qc;h=3801de302d9c80fa2ab8cb0e7e3215d01dbf0ff4;hp=04a5ef303f90462d81b7b36bcce1a10cbb0ce604;hb=7eb9a7c4ea3b9aff3a780584931a75a1fe25a8ad;hpb=d91032b95cf0b02161fb9d64c836df32e6743676

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 04a5ef303..3801de302 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -161,16 +161,16 @@ void onslaught_updatelinks()
 			}
 			if(l.goalentity.classname == "onslaught_generator")
 			{
-				if(l.goalentity.team == COLOR_TEAM1)
+				if(l.goalentity.team == NUM_TEAM_1)
 					l.enemy.isgenneighbor_red = TRUE;
-				else if(l.goalentity.team == COLOR_TEAM2)
+				else if(l.goalentity.team == NUM_TEAM_2)
 					l.enemy.isgenneighbor_blue = TRUE;
 			}
 			else
 			{
-				if(l.goalentity.team == COLOR_TEAM1)
+				if(l.goalentity.team == NUM_TEAM_1)
 					l.enemy.iscpneighbor_red = TRUE;
-				else if(l.goalentity.team == COLOR_TEAM2)
+				else if(l.goalentity.team == NUM_TEAM_2)
 					l.enemy.iscpneighbor_blue = TRUE;
 			}
 		}
@@ -183,16 +183,16 @@ void onslaught_updatelinks()
 			}
 			if(l.enemy.classname == "onslaught_generator")
 			{
-				if(l.enemy.team == COLOR_TEAM1)
+				if(l.enemy.team == NUM_TEAM_1)
 					l.goalentity.isgenneighbor_red = TRUE;
-				else if(l.enemy.team == COLOR_TEAM2)
+				else if(l.enemy.team == NUM_TEAM_2)
 					l.goalentity.isgenneighbor_blue = TRUE;
 			}
 			else
 			{
-				if(l.enemy.team == COLOR_TEAM1)
+				if(l.enemy.team == NUM_TEAM_1)
 					l.goalentity.iscpneighbor_red = TRUE;
-				else if(l.enemy.team == COLOR_TEAM2)
+				else if(l.enemy.team == NUM_TEAM_2)
 					l.goalentity.iscpneighbor_blue = TRUE;
 			}
 		}
@@ -252,10 +252,10 @@ void onslaught_updatelinks()
 	{
 		if (l.iscaptured)
 		{
-			if (l.team == COLOR_TEAM1) t1 = 1;
-			if (l.team == COLOR_TEAM2) t2 = 1;
-			if (l.team == COLOR_TEAM3) t3 = 1;
-			if (l.team == COLOR_TEAM4) t4 = 1;
+			if (l.team == NUM_TEAM_1) t1 = 1;
+			if (l.team == NUM_TEAM_2) t2 = 1;
+			if (l.team == NUM_TEAM_3) t3 = 1;
+			if (l.team == NUM_TEAM_4) t4 = 1;
 		}
 		onslaught_generator_updatesprite(l);
 		l = l.chain;
@@ -269,14 +269,14 @@ void onslaught_updatelinks()
 
 float onslaught_controlpoint_can_be_linked(entity cp, float t)
 {
-	if(t == COLOR_TEAM1)
+	if(t == NUM_TEAM_1)
 	{
 		if(cp.isgenneighbor_red)
 			return 2;
 		if(cp.iscpneighbor_red)
 			return 1;
 	}
-	else if(t == COLOR_TEAM2)
+	else if(t == NUM_TEAM_2)
 	{
 		if(cp.isgenneighbor_blue)
 			return 2;
@@ -352,7 +352,7 @@ float onslaught_controlpoint_attackable(entity cp, float t)
 		// if there's already an icon built, nothing happens
 		if(cp.team == t)
 		{
-			a = onslaught_controlpoint_can_be_linked(cp, COLOR_TEAM1 + COLOR_TEAM2 - t);
+			a = onslaught_controlpoint_can_be_linked(cp, NUM_TEAM_1 + NUM_TEAM_2 - t);
 			if(a) // attackable by enemy?
 				return -2; // EMERGENCY!
 			return -1;
@@ -369,7 +369,7 @@ float onslaught_controlpoint_attackable(entity cp, float t)
 		// free point
 		if(onslaught_controlpoint_can_be_linked(cp, t))
 		{
-			a = onslaught_controlpoint_can_be_linked(cp, COLOR_TEAM1 + COLOR_TEAM2 - t);
+			a = onslaught_controlpoint_can_be_linked(cp, NUM_TEAM_1 + NUM_TEAM_2 - t);
 			if(a == 2)
 				return 4; // GET THIS ONE NOW!
 			else
@@ -594,7 +594,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
 		if (time > self.pain_finished)
 		{
 			self.pain_finished = time + 10;
-			bprint(ColoredTeamName(self.team), " generator under attack!\n");
+			bprint(Team_ColoredFullName(self.team), " generator under attack!\n");
 			play2team(self.team, "onslaught/generator_underattack.wav");
 		}
 	}
@@ -610,19 +610,19 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
 		lh = ceil(self.lasthealth / 100) * 100;
 		h = ceil(self.health / 100) * 100;
 		if(lh != h)
-			bprint(ColoredTeamName(self.team), " generator has less than ", ftos(h), " health remaining\n");
+			bprint(Team_ColoredFullName(self.team), " generator has less than ", ftos(h), " health remaining\n");
 #endif
 		self.lasthealth = self.health;
 	}
 	else if not(inWarmupStage)
 	{
 		if (attacker == self)
-			bprint(ColoredTeamName(self.team), " generator spontaneously exploded due to overtime!\n");
+			bprint(Team_ColoredFullName(self.team), " generator spontaneously exploded due to overtime!\n");
 		else
 		{
 			string t;
-			t = ColoredTeamName(attacker.team);
-			bprint(ColoredTeamName(self.team), " generator destroyed by ", t, "!\n");
+			t = Team_ColoredFullName(attacker.team);
+			bprint(Team_ColoredFullName(self.team), " generator destroyed by ", t, "!\n");
 		}
 		self.iscaptured = FALSE;
 		self.islinked = FALSE;
@@ -704,16 +704,16 @@ string onslaught_generator_waypointsprite_for_team(entity e, float t)
 {
 	if(t == e.team)
 	{
-		if(e.team == COLOR_TEAM1)
+		if(e.team == NUM_TEAM_1)
 			return "ons-gen-red";
-		else if(e.team == COLOR_TEAM2)
+		else if(e.team == NUM_TEAM_2)
 			return "ons-gen-blue";
 	}
 	if(e.isshielded)
 		return "ons-gen-shielded";
-	if(e.team == COLOR_TEAM1)
+	if(e.team == NUM_TEAM_1)
 		return "ons-gen-red";
-	else if(e.team == COLOR_TEAM2)
+	else if(e.team == NUM_TEAM_2)
 		return "ons-gen-blue";
 	return "";
 }
@@ -721,8 +721,8 @@ string onslaught_generator_waypointsprite_for_team(entity e, float t)
 void onslaught_generator_updatesprite(entity e)
 {
 	string s1, s2, s3;
-	s1 = onslaught_generator_waypointsprite_for_team(e, COLOR_TEAM1);
-	s2 = onslaught_generator_waypointsprite_for_team(e, COLOR_TEAM2);
+	s1 = onslaught_generator_waypointsprite_for_team(e, NUM_TEAM_1);
+	s2 = onslaught_generator_waypointsprite_for_team(e, NUM_TEAM_2);
 	s3 = onslaught_generator_waypointsprite_for_team(e, -1);
 	WaypointSprite_UpdateSprites(e.sprite, s1, s2, s3);
 
@@ -732,14 +732,14 @@ void onslaught_generator_updatesprite(entity e)
 		e.lastshielded = e.isshielded;
 		if(e.lastshielded)
 		{
-			if(e.team == COLOR_TEAM1 || e.team == COLOR_TEAM2)
+			if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, 0.5 * colormapPaletteColor(e.team - 1, FALSE));
 			else
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, '0.5 0.5 0.5');
 		}
 		else
 		{
-			if(e.team == COLOR_TEAM1 || e.team == COLOR_TEAM2)
+			if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, colormapPaletteColor(e.team - 1, FALSE));
 			else
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, '0.75 0.75 0.75');
@@ -756,25 +756,25 @@ string onslaught_controlpoint_waypointsprite_for_team(entity e, float t)
 		a = onslaught_controlpoint_attackable(e, t);
 		if(a == 3 || a == 4) // ATTACK/TOUCH THIS ONE NOW
 		{
-			if(e.team == COLOR_TEAM1)
+			if(e.team == NUM_TEAM_1)
 				return "ons-cp-atck-red";
-			else if(e.team == COLOR_TEAM2)
+			else if(e.team == NUM_TEAM_2)
 				return "ons-cp-atck-blue";
 			else
 				return "ons-cp-atck-neut";
 		}
 		else if(a == -2) // DEFEND THIS ONE NOW
 		{
-			if(e.team == COLOR_TEAM1)
+			if(e.team == NUM_TEAM_1)
 				return "ons-cp-dfnd-red";
-			else if(e.team == COLOR_TEAM2)
+			else if(e.team == NUM_TEAM_2)
 				return "ons-cp-dfnd-blue";
 		}
 		else if(e.team == t || a == -1 || a == 1) // own point, or fire at it
 		{
-			if(e.team == COLOR_TEAM1)
+			if(e.team == NUM_TEAM_1)
 				return "ons-cp-red";
-			else if(e.team == COLOR_TEAM2)
+			else if(e.team == NUM_TEAM_2)
 				return "ons-cp-blue";
 		}
 		else if(a == 2) // touch it
@@ -782,9 +782,9 @@ string onslaught_controlpoint_waypointsprite_for_team(entity e, float t)
 	}
 	else
 	{
-		if(e.team == COLOR_TEAM1)
+		if(e.team == NUM_TEAM_1)
 			return "ons-cp-red";
-		else if(e.team == COLOR_TEAM2)
+		else if(e.team == NUM_TEAM_2)
 			return "ons-cp-blue";
 		else
 			return "ons-cp-neut";
@@ -795,13 +795,13 @@ string onslaught_controlpoint_waypointsprite_for_team(entity e, float t)
 void onslaught_controlpoint_updatesprite(entity e)
 {
 	string s1, s2, s3;
-	s1 = onslaught_controlpoint_waypointsprite_for_team(e, COLOR_TEAM1);
-	s2 = onslaught_controlpoint_waypointsprite_for_team(e, COLOR_TEAM2);
+	s1 = onslaught_controlpoint_waypointsprite_for_team(e, NUM_TEAM_1);
+	s2 = onslaught_controlpoint_waypointsprite_for_team(e, NUM_TEAM_2);
 	s3 = onslaught_controlpoint_waypointsprite_for_team(e, -1);
 	WaypointSprite_UpdateSprites(e.sprite, s1, s2, s3);
 
 	float sh;
-	sh = !(onslaught_controlpoint_can_be_linked(e, COLOR_TEAM1) || onslaught_controlpoint_can_be_linked(e, COLOR_TEAM2));
+	sh = !(onslaught_controlpoint_can_be_linked(e, NUM_TEAM_1) || onslaught_controlpoint_can_be_linked(e, NUM_TEAM_2));
 
 	if(e.lastteam != e.team + 2 || e.lastshielded != sh || e.iscaptured != e.lastcaptured)
 	{
@@ -819,14 +819,14 @@ void onslaught_controlpoint_updatesprite(entity e)
 		}
 		if(e.lastshielded)
 		{
-			if(e.team == COLOR_TEAM1 || e.team == COLOR_TEAM2)
+			if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, 0.5 * colormapPaletteColor(e.team - 1, FALSE));
 			else
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, '0.5 0.5 0.5');
 		}
 		else
 		{
-			if(e.team == COLOR_TEAM1 || e.team == COLOR_TEAM2)
+			if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, colormapPaletteColor(e.team - 1, FALSE));
 			else
 				WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, '0.75 0.75 0.75');
@@ -911,10 +911,10 @@ void spawnfunc_onslaught_generator()
 	if (!self.team)
 		objerror("team must be set");
 	
-	if(self.team == COLOR_TEAM1)
+	if(self.team == NUM_TEAM_1)
         ons_red_generator = self;
 
-	if(self.team == COLOR_TEAM2)
+	if(self.team == NUM_TEAM_2)
         ons_blue_generator = self;
         
 	self.team_saved = self.team;
@@ -949,7 +949,7 @@ void spawnfunc_onslaught_generator()
 	InitializeEntity(self, onslaught_generator_delayed, INITPRIO_LAST);
 
 	WaypointSprite_SpawnFixed(string_null, self.origin + '0 0 128', self, sprite, RADARICON_NONE, '0 0 0');
-	WaypointSprite_UpdateRule(self.sprite, COLOR_TEAM2, SPRITERULE_TEAMPLAY);
+	WaypointSprite_UpdateRule(self.sprite, NUM_TEAM_2, SPRITERULE_TEAMPLAY);
 	WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
 	WaypointSprite_UpdateHealth(self.sprite, self.health);
 
@@ -989,7 +989,7 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
 	if (attacker.classname == "player")
 	{
 		nag = FALSE;
-		if(self.team == COLOR_TEAM1)
+		if(self.team == NUM_TEAM_1)
 		{
 			if(time - ons_notification_time_team1 > 10)
 			{
@@ -997,7 +997,7 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
 				ons_notification_time_team1 = time;
 			}
 		}
-		else if(self.team == COLOR_TEAM2)
+		else if(self.team == NUM_TEAM_2)
 		{
 			if(time - ons_notification_time_team2 > 10)
 			{
@@ -1036,8 +1036,8 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
 		pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1);
 		{
 			string t;
-			t = ColoredTeamName(attacker.team);
-			bprint(ColoredTeamName(self.team), " ", self.message, " control point destroyed by ", t, "\n");
+			t = Team_ColoredFullName(attacker.team);
+			bprint(Team_ColoredFullName(self.team), " ", self.message, " control point destroyed by ", t, "\n");
 			ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 25, "models/onslaught/controlpoint_icon_gib1.md3", 3, FALSE);
 			ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE);
 			ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE);
@@ -1235,7 +1235,7 @@ void onslaught_controlpoint_icon_buildthink()
 		self.count = autocvar_g_onslaught_cp_regen * sys_frametime; // slow repair rate from now on
 		self.think = onslaught_controlpoint_icon_think;
 		sound(self, CH_TRIGGER, "onslaught/controlpoint_built.wav", VOL_BASE, ATTN_NORM);
-		bprint(ColoredTeamName(self.team), " captured ", self.owner.message, " control point\n");
+		bprint(Team_ColoredFullName(self.team), " captured ", self.owner.message, " control point\n");
 		self.owner.iscaptured = TRUE;
 
 		WaypointSprite_UpdateMaxHealth(self.owner.sprite, self.max_health);
@@ -1399,7 +1399,7 @@ void spawnfunc_onslaught_controlpoint()
 	waypoint_spawnforitem(self);
 
 	WaypointSprite_SpawnFixed(string_null, self.origin + '0 0 128', self, sprite, RADARICON_NONE, '0 0 0');
-	WaypointSprite_UpdateRule(self.sprite, COLOR_TEAM2, SPRITERULE_TEAMPLAY);
+	WaypointSprite_UpdateRule(self.sprite, NUM_TEAM_2, SPRITERULE_TEAMPLAY);
 
 	onslaught_updatelinks();
 
@@ -1437,28 +1437,28 @@ void onslaught_link_checkupdate()
 	redpower = bluepower = 0;
 	if(self.goalentity.islinked)
 	{
-		if(self.goalentity.team == COLOR_TEAM1)
+		if(self.goalentity.team == NUM_TEAM_1)
 			redpower = 1;
-		else if(self.goalentity.team == COLOR_TEAM2)
+		else if(self.goalentity.team == NUM_TEAM_2)
 			bluepower = 1;
 	}
 	if(self.enemy.islinked)
 	{
-		if(self.enemy.team == COLOR_TEAM1)
+		if(self.enemy.team == NUM_TEAM_1)
 			redpower = 2;
-		else if(self.enemy.team == COLOR_TEAM2)
+		else if(self.enemy.team == NUM_TEAM_2)
 			bluepower = 2;
 	}
 
 	float cc;
 	if(redpower == 1 && bluepower == 2)
-		cc = (COLOR_TEAM1 - 1) * 0x01 + (COLOR_TEAM2 - 1) * 0x10;
+		cc = (NUM_TEAM_1 - 1) * 0x01 + (NUM_TEAM_2 - 1) * 0x10;
 	else if(redpower == 2 && bluepower == 1)
-		cc = (COLOR_TEAM1 - 1) * 0x10 + (COLOR_TEAM2 - 1) * 0x01;
+		cc = (NUM_TEAM_1 - 1) * 0x10 + (NUM_TEAM_2 - 1) * 0x01;
 	else if(redpower)
-		cc = (COLOR_TEAM1 - 1) * 0x11;
+		cc = (NUM_TEAM_1 - 1) * 0x11;
 	else if(bluepower)
-		cc = (COLOR_TEAM2 - 1) * 0x11;
+		cc = (NUM_TEAM_2 - 1) * 0x11;
 	else
 		cc = 0;
 
@@ -1530,10 +1530,10 @@ MUTATOR_HOOKFUNCTION(ons_Spawn_Score)
     
 	RandomSelection_Init();
 	
-	if(self.team == COLOR_TEAM1)
+	if(self.team == NUM_TEAM_1)
         RandomSelection_Add(ons_red_generator, 0, string_null, 1, 1);
 	
-	if(self.team == COLOR_TEAM2)
+	if(self.team == NUM_TEAM_2)
         RandomSelection_Add(ons_blue_generator, 0, string_null, 1, 1);
 	
 	entity _cp = findchain(classname, "onslaught_controlpoint"):
@@ -1572,7 +1572,7 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
     
 	RandomSelection_Init();
     
-	if(self.team == COLOR_TEAM1)
+	if(self.team == NUM_TEAM_1)
 	{
 	    if(!_close_to_home)
             _trg_gen = ons_blue_generator;
@@ -1580,7 +1580,7 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
             _trg_gen  = ons_red_generator;        
 	}
 	
-	if(self.team == COLOR_TEAM2)
+	if(self.team == NUM_TEAM_2)
 	{
 	    if(_close_to_home)
             _trg_gen = ons_blue_generator;
@@ -1625,7 +1625,7 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
         if(!autocvar_g_onslaught_spawn_at_generator)
             return 0;
         
-        _trg_gen = ((self.team == COLOR_TEAM1) ? ons_red_generator : ons_blue_generator);
+        _trg_gen = ((self.team == NUM_TEAM_1) ? ons_red_generator : ons_blue_generator);
         
         for(i = 0; i < 10; ++i)
         {