r3694 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-06-07 08:52:51 -0400 (Sat, 07 Jun 2008)
New Revision: 3694

Modified:
   trunk/data/qcsrc/server/vote.qc
Log:
get rid of the warning and of empty kick votes

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2008-06-07 12:09:08 UTC (rev 3693)
+++ trunk/data/qcsrc/server/vote.qc	2008-06-07 12:52:51 UTC (rev 3694)
@@ -59,6 +59,7 @@
 }
 
 float GameCommand_Vote(string s, entity e) {
+	local entity victim;
 	if(argv(0) == "help") {
 		print_to(e, "  vote COMMANDS ARGUMENTS. See 'vote help' for more info.");
 		return TRUE;
@@ -109,9 +110,8 @@
 						}
 
 						// make kick and kickban votes a bit nicer (and reject them if formatted badly)
-						if(substring(vote, 0, 5) == "kick " || substring(vote, 0, 8) == "kickban ")
+						if(substring(vote, 0, 4) == "kick" || substring(vote, 0, 7) == "kickban")
 						{
-							local entity victim;
 							if(!(victim = GetKickVoteVictim(vote, "vcall", e)))
 								return TRUE;
 							vote = GetKickVoteVictim_newcommand;
@@ -197,9 +197,8 @@
 					}
 
 					dovote_display = dovote;
-					if(substring(dovote, 0, 5) == "kick " || substring(dovote, 0, 8) == "kickban ")
+					if(substring(dovote, 0, 4) == "kick" || substring(dovote, 0, 7) == "kickban")
 					{
-						local entity victim;
 						if(!(victim = GetKickVoteVictim(dovote, "vdo", e)))
 							return TRUE;
 						dovote = GetKickVoteVictim_newcommand;