r5524 - in trunk/data: . qcsrc/server

[esteel at icculus.org]

Author: esteel
Date: 2009-01-14 08:39:14 -0500 (Wed, 14 Jan 2009)
New Revision: 5524

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/defs.qh
Log:
renamed calltimeout/resumegame to timein/timeout.  As its hardly used (so far ladder only) not worrying about compatibility


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-01-14 12:59:31 UTC (rev 5523)
+++ trunk/data/defaultNexuiz.cfg	2009-01-14 13:39:14 UTC (rev 5524)
@@ -46,8 +46,8 @@
 alias lockteams "sv_cmd lockteams"
 alias unlockteams "sv_cmd unlockteams"
 alias nospectators "sv_cmd nospectators"
-alias calltimeout "cmd calltimeout" //use this command to call a timeout
-alias resumegame "cmd resumegame" //use this command if you don't need the remaining time of the timeout anymore
+alias timeout "cmd timeout" //use this command to call a timeout
+alias timein "cmd timein" //use this command to resume the game before timeout is finished
 
 alias bsp "ls maps/*.bsp"
 alias chmap "changelevel $*"

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2009-01-14 12:59:31 UTC (rev 5523)
+++ trunk/data/qcsrc/server/clientcommands.qc	2009-01-14 13:39:14 UTC (rev 5524)
@@ -245,7 +245,7 @@
 			wordwrap_sprint(cmd, 1111);
 	} else if(argv(0) == "suggestmap") {
 		sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
-	} else if(argv(0) == "calltimeout") {
+	} else if(argv(0) == "timeout") {
 		if not(self.flags & FL_CLIENT)
 			return;
 		if(cvar("sv_timeout")) {
@@ -253,16 +253,16 @@
 				if(votecalled)
 					sprint(self, "^7Error: you can not call a timeout while a vote is active!\n");
 				else
-					evaluateTimeoutCall();
+					evaluateTimeout();
 			}
 			else
 				sprint(self, "^7Error: only players can call a timeout!\n");
 		}
-	} else if(argv(0) == "resumegame") {
+	} else if(argv(0) == "timein") {
 		if not(self.flags & FL_CLIENT)
 			return;
 		if(cvar("sv_timeout")) {
-			evaluateResumeGame();
+			evaluateTimein();
 		}
 	} else if(argv(0) == "teamstatus") {
 		Score_NicePrint(self);
@@ -499,7 +499,7 @@
  *
  * This function is called when a player issues the calltimeout command.
  */
-void evaluateTimeoutCall() {
+void evaluateTimeout() {
 	if (inWarmupStage && !g_warmup_allow_timeout)
 		return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n");
 	if (time < game_starttime )
@@ -547,7 +547,7 @@
  *
  * This function is called when a player issues the resumegame command.
  */
-void evaluateResumeGame() {
+void evaluateTimein() {
 	if (!timeoutStatus)
 		return sprint(self, "^7Error: There is no active timeout which could be aborted!\n");
 	if (self != timeoutInitiator)

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-01-14 12:59:31 UTC (rev 5523)
+++ trunk/data/qcsrc/server/defs.qh	2009-01-14 13:39:14 UTC (rev 5524)
@@ -286,8 +286,8 @@
 .vector lastV_angle; //used when pausing the game in order to force the player to keep his old view angle fixed
 entity timeoutHandler; //responsible for centerprinting the timeout countdowns and playing sounds
 void timeoutHandler_Think();
-void evaluateTimeoutCall();
-void evaluateResumeGame();
+void evaluateTimeout();
+void evaluateTimein();
 string getTimeoutText(float addOneSecond);
 
 .float spawnshieldtime;