r1923 - branches/nexuiz-2.0/data/qcsrc/server trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: kadaverjack
Date: 2006-11-11 08:51:03 -0500 (Sat, 11 Nov 2006)
New Revision: 1923

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
cleaned up my autoscreenshot changes from this morning


Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2006-11-11 02:42:00 UTC (rev 1922)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2006-11-11 13:51:03 UTC (rev 1923)
@@ -661,14 +661,15 @@
 */
 void() IntermissionThink =
 {
-	if(self.cnt)
+	if(cvar("sv_autoscreenshot"))
 	if(self.cnt > time)
 	{
 		self.cnt = FALSE;
 		if(clienttype(self) == CLIENTTYPE_REAL)
-		if(cvar("sv_autoscreenshot"))
-			stuffcmd(self, "wait\nscreenshot\necho \"^5A screenshot has been taken at request of the server.\"\n");
+			stuffcmd(self, "screenshot\necho \"^5A screenshot has been taken at request of the server.\"\n");
+		return;
 	}
+
 	if (time < intermission_exittime)
 		return;
 

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2006-11-11 02:42:00 UTC (rev 1922)
+++ trunk/data/qcsrc/server/g_world.qc	2006-11-11 13:51:03 UTC (rev 1923)
@@ -696,14 +696,15 @@
 */
 void() IntermissionThink =
 {
-	if(self.cnt)
+	if(cvar("sv_autoscreenshot"))
 	if(self.cnt > time)
 	{
 		self.cnt = FALSE;
 		if(clienttype(self) == CLIENTTYPE_REAL)
-		if(cvar("sv_autoscreenshot"))
-			stuffcmd(self, "wait\nscreenshot\necho \"^5A screenshot has been taken at request of the server.\"\n");
+			stuffcmd(self, "screenshot\necho \"^5A screenshot has been taken at request of the server.\"\n");
+		return;
 	}
+
 	if (time < intermission_exittime)
 		return;