r4592 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-03 02:32:56 -0400 (Fri, 03 Oct 2008)
New Revision: 4592

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
Log:
turn off useless radar circles on keyhunt captures


Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2008-10-03 06:27:14 UTC (rev 4591)
+++ trunk/data/qcsrc/server/keyhunt.qc	2008-10-03 06:32:56 UTC (rev 4592)
@@ -22,6 +22,7 @@
 float KH_KEY_BRIGHTNESS = 2;
 
 string kh_Controller_Waitmsg;
+float kh_no_radar_circles;
 
 // kh_state
 //     bits 0-7: player's key status
@@ -279,7 +280,8 @@
 		if(key.owner.kh_next == world)
 		{
 			// No longer a key carrier
-			WaypointSprite_Ping(key.owner.waypointsprite_attachedforcarrier);
+			if(!kh_no_radar_circles)
+				WaypointSprite_Ping(key.owner.waypointsprite_attachedforcarrier);
 			WaypointSprite_DetachCarrier(key.owner);
 		}
 	}
@@ -324,7 +326,8 @@
 			else if(player.team == COLOR_TEAM4)
 				WaypointSprite_UpdateSprites(player.waypointsprite_attachedforcarrier, "keycarrier-pink", "keycarrier-friend", "");
 			WaypointSprite_UpdateTeamRadar(player.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, colormapPaletteColor(player.team - 1));
-			WaypointSprite_Ping(player.waypointsprite_attachedforcarrier);
+			if(!kh_no_radar_circles)
+				WaypointSprite_Ping(player.waypointsprite_attachedforcarrier);
 		}
 	}
 	
@@ -785,8 +788,11 @@
 	// prepare next round
 	kh_interferemsg_time = 0;
 	entity key;
+
+	kh_no_radar_circles = TRUE;
 	FOR_EACH_KH_KEY(key)
 		kh_Key_Remove(key);
+	kh_no_radar_circles = FALSE;
 
 	kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round"), "Round starts in ", kh_StartRound);
 }