From: Samual Lenks <samual@xonotic.org>
Date: Mon, 29 Apr 2013 01:22:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
X-Git-Tag: xonotic-v0.7.0~65
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=27e0dcee207c9b4ab3e36bde11dee4dcb260bd13;hp=f00dd29e71e236ddd2d79f44256ff589cbeac350

Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
---

diff --git a/qcsrc/server/mutators/gamemode_domination.qc b/qcsrc/server/mutators/gamemode_domination.qc
index 051eaa333f..98b9b40dd8 100644
--- a/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@ -19,6 +19,7 @@ void dompoint_captured ()
 {
 	entity head;
 	float old_delay, old_team, real_team;
+	string msg = "dom-neut";
 
 	// now that the delay has expired, switch to the latest team to lay claim to this point
 	head = self.owner;
@@ -74,8 +75,16 @@ void dompoint_captured ()
 	SUB_UseTargets ();
 	self.delay = old_delay;
 	self.team = old_team;
+	
+	switch(self.team)
+	{
+		case NUM_TEAM_1: msg = "dom-red"; break;
+		case NUM_TEAM_2: msg = "dom-blue"; break;
+		case NUM_TEAM_3: msg = "dom-yellow"; break;
+		case NUM_TEAM_4: msg = "dom-pink"; break;
+	}
 
-	WaypointSprite_UpdateSprites(self.sprite, strcat("dom-", Team_ColorName_Lower(self.goalentity.team)), "", "");
+	WaypointSprite_UpdateSprites(self.sprite, msg, "", "");
 	
 	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; )