Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)
qcsrc/server/mutators/gamemode_domination.qc

index 051eaa333ff1c6b61ab4e47385cdc3411a2214dd..98b9b40dd857c5052395bd0d7b09e8d8bfb7a0df 100644 (file)
@@ -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; )