r5901 - in trunk/data: . qcsrc/server

[esteel at icculus.org]

Author: esteel
Date: 2009-02-19 16:54:35 -0500 (Thu, 19 Feb 2009)
New Revision: 5901

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/clientcommands.qc
Log:
make ready toggle the readystate and remove the unready command, people seem to like this more

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-19 21:04:19 UTC (rev 5900)
+++ trunk/data/defaultNexuiz.cfg	2009-02-19 21:54:35 UTC (rev 5901)
@@ -54,7 +54,6 @@
 alias +hook +button6
 alias -hook -button6
 alias ready "cmd ready"
-alias unready "cmd unready"
 alias lockteams "sv_cmd lockteams"
 alias unlockteams "sv_cmd unlockteams"
 alias nospectators "sv_cmd nospectators"

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2009-02-19 21:04:19 UTC (rev 5900)
+++ trunk/data/qcsrc/server/clientcommands.qc	2009-02-19 21:54:35 UTC (rev 5901)
@@ -224,7 +224,7 @@
 		} else {
 			sprint( self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
 		}
-	} else if((argv(0) == "ready") || (argv(0) == "unready")) {
+	} else if(argv(0) == "ready") {
 		if not(self.flags & FL_CLIENT)
 			return;
 
@@ -233,15 +233,15 @@
 		{
 			if(!readyrestart_happened || cvar("sv_ready_restart_repeatable"))
 			{
-				if (argv(0) == "ready")
+				if (self.ready) // toggle
 				{
-					self.ready = TRUE;
-					bprint(self.netname, "^2 is ready\n");
+					self.ready = FALSE;
+					bprint(self.netname, "^2 is ^1NOT^2 ready\n");
 				}
 				else
 				{
-					self.ready = FALSE;
-					bprint(self.netname, "^2 is ^1NOT^2 ready\n");
+					self.ready = TRUE;
+					bprint(self.netname, "^2 is ready\n");
 				}
 
 				// cannot reset the game while a timeout is active!