r3693 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-06-07 08:09:08 -0400 (Sat, 07 Jun 2008)
New Revision: 3693

Modified:
   trunk/data/qcsrc/server/vote.qc
Log:
fixed kickvotes

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2008-06-07 11:53:24 UTC (rev 3692)
+++ trunk/data/qcsrc/server/vote.qc	2008-06-07 12:09:08 UTC (rev 3693)
@@ -111,10 +111,11 @@
 						// 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(!(e = GetKickVoteVictim(vote, "vcall", e)))
+							local entity victim;
+							if(!(victim = GetKickVoteVictim(vote, "vcall", e)))
 								return TRUE;
 							vote = GetKickVoteVictim_newcommand;
-							votecalledvote_display = strzone(strcat("^1", vote, " (^7", VoteNetname(e), "^1): ", GetKickVoteVictim_reason));
+							votecalledvote_display = strzone(strcat("^1", vote, " (^7", victim.netname, "^1): ", GetKickVoteVictim_reason));
 						}
 						else
 						{
@@ -198,10 +199,11 @@
 					dovote_display = dovote;
 					if(substring(dovote, 0, 5) == "kick " || substring(dovote, 0, 8) == "kickban ")
 					{
-						if(!(e = GetKickVoteVictim(dovote, "vdo", e)))
+						local entity victim;
+						if(!(victim = GetKickVoteVictim(dovote, "vdo", e)))
 							return TRUE;
 						dovote = GetKickVoteVictim_newcommand;
-						dovote_display = strcat("^1", dovote, " (^7", VoteNetname(e), "^1): ", GetKickVoteVictim_reason);
+						dovote_display = strcat("^1", dovote, " (^7", victim.netname, "^1): ", GetKickVoteVictim_reason);
 					}
 					bprint("\{1}^2* ^3", VoteNetname(e), "^2 used his ^3master^2 status to do \"^2", dovote_display, "^2\".\n");
 					if(cvar("sv_eventlog"))