[quake3-commits] r1751 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: tma
Date: 2009-11-11 05:51:33 -0500 (Wed, 11 Nov 2009)
New Revision: 1751

Modified:
   trunk/code/client/cl_main.c
Log:
* Fix demo playback being broken, not entirely sure by what or when

Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2009-11-10 02:17:32 UTC (rev 1750)
+++ trunk/code/client/cl_main.c	2009-11-11 10:51:33 UTC (rev 1751)
@@ -929,7 +929,7 @@
 	char		retry[MAX_OSPATH];
 
 	if (Cmd_Argc() != 2) {
-		Com_Printf ("playdemo <demoname>\n");
+		Com_Printf ("demo <demoname>\n");
 		return;
 	}
 
@@ -937,14 +937,17 @@
 	// 2 means don't force disconnect of local client
 	Cvar_Set( "sv_killserver", "2" );
 
-	CL_Disconnect( qtrue );
-
 	// open the demo file
 	arg = Cmd_Argv(1);
 	
+	CL_Disconnect( qtrue );
+
 	// check for an extension .dm_?? (?? is protocol)
 	ext_test = arg + strlen(arg) - 6;
-	if ((strlen(arg) > 6) && (ext_test[0] == '.') && ((ext_test[1] == 'd') || (ext_test[1] == 'D')) && ((ext_test[2] == 'm') || (ext_test[2] == 'M')) && (ext_test[3] == '_'))
+	if ((strlen(arg) > 6) && (ext_test[0] == '.') &&
+		((ext_test[1] == 'd') || (ext_test[1] == 'D')) &&
+		((ext_test[2] == 'm') || (ext_test[2] == 'M')) &&
+		(ext_test[3] == '_'))
 	{
 		protocol = atoi(ext_test+4);
 		i=0;