r2990 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-11-22 17:27:07 -0500 (Thu, 22 Nov 2007)
New Revision: 2990

Modified:
   trunk/data/qcsrc/server/clientcommands.qc
Log:
fix broken vdo command remapping (broke anything but chmap)


Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2007-11-22 15:01:43 UTC (rev 2989)
+++ trunk/data/qcsrc/server/clientcommands.qc	2007-11-22 22:27:07 UTC (rev 2990)
@@ -294,12 +294,15 @@
 				if(dovote == "") {
 					sprint(self, "^1Your command was empty. See help for more info.\n");
 				} else if(VoteAllowed(strcat1(argv(2)))) { // strcat seems to be necessary
-					if(!ValidateMap(dovote))
-						return;
-					// remap chmap to gotomap (forces intermission)
-					if(strlen(dovote) >= 6)
-						if(substring(dovote, 0, 6) == "chmap ")
-							dovote = strcat("gotomap ", substring(dovote, 6, strlen(dovote) - 6));
+					if(substring(dovote, 0, 6) == "chmap ")
+						dovote = strcat("gotomap ", substring(dovote, 6, strlen(dovote) - 6));
+					if(substring(dovote, 0, 8) == "gotomap ")
+					{
+						if(!(dovote = ValidateMap(substring(dovote, 8, strlen(dovote) - 8))))
+							return;
+						dovote = strcat("gotomap ", dovote);
+					}
+
 					dovote_display = dovote;
 					if(substring(dovote, 0, 5) == "kick " || substring(dovote, 0, 8) == "kickban ")
 					{