r2415 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-30 11:28:05 -0400 (Mon, 30 Apr 2007)
New Revision: 2415

Modified:
   trunk/data/qcsrc/server/havocbot_roles.qc
   trunk/data/qcsrc/server/keyhunt.qc
   trunk/data/qcsrc/server/keyhunt.qh
Log:
two simple KH bugs...


Modified: trunk/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot_roles.qc	2007-04-30 14:39:30 UTC (rev 2414)
+++ trunk/data/qcsrc/server/havocbot_roles.qc	2007-04-30 15:28:05 UTC (rev 2415)
@@ -520,6 +520,9 @@
 	{
 		if(head.owner == self)
 			continue;
+		if(!kh_tracking_enabled)
+			if(!head.owner || head.team == self.team)
+				continue; // skip what I can't see
 		if(!head.owner)
 			navigation_routerating(head, ratingscale_dropped);
 		else if(head.team == self.team)

Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2007-04-30 14:39:30 UTC (rev 2414)
+++ trunk/data/qcsrc/server/keyhunt.qc	2007-04-30 15:28:05 UTC (rev 2415)
@@ -518,6 +518,12 @@
 		if(!kh_tracking_enabled)
 			return 0;
 
+	// e is no key carrier: simple case...
+	if(!e.kh_next)
+		return kh_GetCarrierSprite(self.team);
+	
+	// e is a key carrier: if any key is dropped or owned by another team, show
+	// the carrier sprite; otherwise show run here
 	FOR_EACH_KH_KEY(key)
 		if(!key.owner || key.team != e.team)
 		{

Modified: trunk/data/qcsrc/server/keyhunt.qh
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qh	2007-04-30 14:39:30 UTC (rev 2414)
+++ trunk/data/qcsrc/server/keyhunt.qh	2007-04-30 15:28:05 UTC (rev 2415)
@@ -1,4 +1,5 @@
 float kh_teams;
+float kh_tracking_enabled;
 
 void kh_Log();
 void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner);