From f81092c6212733357734ae9db4bd638c0a81a22e Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 8 Oct 2008 07:58:41 +0000
Subject: [PATCH] fix bogus keyhunt interfere messages

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4656 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/keyhunt.qc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc
index 3068f40d5..45e0661f4 100644
--- a/data/qcsrc/server/keyhunt.qc
+++ b/data/qcsrc/server/keyhunt.qc
@@ -344,6 +344,8 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 		}
 		else
 		{
+			kh_interferemsg_time = 0;
+
 			// audit all key carrier sprites, update them to RUN HERE
 			FOR_EACH_KH_KEY(k)
 			{
@@ -452,8 +454,10 @@ float kh_Key_AllOwnedByWhichTeam()  // constantly called. check to see if all th
 {
 	entity key;
 	float teem;
+	float keys;
 
 	teem = -1;
+	keys = kh_teams;
 	FOR_EACH_KH_KEY(key)
 	{
 		if(!key.owner)
@@ -462,7 +466,10 @@ float kh_Key_AllOwnedByWhichTeam()  // constantly called. check to see if all th
 			teem = key.team;
 		else if(teem != key.team)
 			return -1;
+		--keys;
 	}
+	if(keys != 0)
+		return -1;
 	return teem;
 }
 
-- 
2.39.2