r4656 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-08 03:58:41 -0400 (Wed, 08 Oct 2008)
New Revision: 4656

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
Log:
fix bogus keyhunt interfere messages


Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2008-10-08 05:28:04 UTC (rev 4655)
+++ trunk/data/qcsrc/server/keyhunt.qc	2008-10-08 07:58:41 UTC (rev 4656)
@@ -344,6 +344,8 @@
 		}
 		else
 		{
+			kh_interferemsg_time = 0;
+
 			// audit all key carrier sprites, update them to RUN HERE
 			FOR_EACH_KH_KEY(k)
 			{
@@ -452,8 +454,10 @@
 {
 	entity key;
 	float teem;
+	float keys;
 
 	teem = -1;
+	keys = kh_teams;
 	FOR_EACH_KH_KEY(key)
 	{
 		if(!key.owner)
@@ -462,7 +466,10 @@
 			teem = key.team;
 		else if(teem != key.team)
 			return -1;
+		--keys;
 	}
+	if(keys != 0)
+		return -1;
 	return teem;
 }