X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_domination.qc;h=1c2ded2dbf893984ee3936e960a5febdabb017f3;hb=80ea2c26461cab2b2992f79643eaf59aacb7cda7;hp=852fb90c05dc287c0fdfeedeb31b61f6f9f4aa23;hpb=78fd790dbb8690b148bd9270934b8e918a2fbc00;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_domination.qc b/qcsrc/server/mutators/gamemode_domination.qc
index 852fb90c0..1c2ded2db 100644
--- a/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@ -75,21 +75,8 @@ void dompoint_captured ()
 	self.delay = old_delay;
 	self.team = old_team;
 
-	switch(self.goalentity.team)
-	{
-		case COLOR_TEAM1:
-			WaypointSprite_UpdateSprites(self.sprite, "dom-red", "", "");
-			break;
-		case COLOR_TEAM2:
-			WaypointSprite_UpdateSprites(self.sprite, "dom-blue", "", "");
-			break;
-		case COLOR_TEAM3:
-			WaypointSprite_UpdateSprites(self.sprite, "dom-yellow", "", "");
-			break;
-		case COLOR_TEAM4:
-			WaypointSprite_UpdateSprites(self.sprite, "dom-pink", "", "");
-	}
-
+	WaypointSprite_UpdateSprites(self.sprite, strcat("dom-", Team_ColorName_Lower(self.goalentity.team)), "", "");
+	
 	total_pps = 0, pps_red = 0, pps_blue = 0, pps_yellow = 0, pps_pink = 0;
 	for(head = world; (head = find(head, classname, "dom_controlpoint")) != world; )
 	{
@@ -103,16 +90,16 @@ void dompoint_captured ()
 			wait_time = head.wait;
 		switch(head.goalentity.team)
 		{
-			case COLOR_TEAM1:
+			case FL_TEAM_1:
 				pps_red += points/wait_time;
 				break;
-			case COLOR_TEAM2:
+			case FL_TEAM_2:
 				pps_blue += points/wait_time;
 				break;
-			case COLOR_TEAM3:
+			case FL_TEAM_3:
 				pps_yellow += points/wait_time;
 				break;
-			case COLOR_TEAM4:
+			case FL_TEAM_4:
 				pps_pink += points/wait_time;
 		}
 		total_pps += points/wait_time;
@@ -454,12 +441,12 @@ void dom_spawnteams()
 {
 	float numteams = ((autocvar_g_domination_teams_override < 2) ? autocvar_g_domination_default_teams : autocvar_g_domination_teams_override);
 
-	dom_spawnteam("Red", COLOR_TEAM1-1, "models/domination/dom_red.md3", 0, "domination/claim.wav", "", "Red team has captured a control point");
-	dom_spawnteam("Blue", COLOR_TEAM2-1, "models/domination/dom_blue.md3", 0, "domination/claim.wav", "", "Blue team has captured a control point");
+	dom_spawnteam("Red", FL_TEAM_1-1, "models/domination/dom_red.md3", 0, "domination/claim.wav", "", "Red team has captured a control point");
+	dom_spawnteam("Blue", FL_TEAM_2-1, "models/domination/dom_blue.md3", 0, "domination/claim.wav", "", "Blue team has captured a control point");
 	if(numteams > 2)
-		dom_spawnteam("Yellow", COLOR_TEAM3-1, "models/domination/dom_yellow.md3", 0, "domination/claim.wav", "", "Yellow team has captured a control point");
+		dom_spawnteam("Yellow", FL_TEAM_3-1, "models/domination/dom_yellow.md3", 0, "domination/claim.wav", "", "Yellow team has captured a control point");
 	if(numteams > 3)
-		dom_spawnteam("Pink", COLOR_TEAM4-1, "models/domination/dom_pink.md3", 0, "domination/claim.wav", "", "Pink team has captured a control point");
+		dom_spawnteam("Pink", FL_TEAM_4-1, "models/domination/dom_pink.md3", 0, "domination/claim.wav", "", "Pink team has captured a control point");
 	dom_spawnteam("", 0, "models/domination/dom_unclaimed.md3", 0, "", "", "");
 }