r880 - in trunk/code: client qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2006-08-27 21:48:38 -0400 (Sun, 27 Aug 2006)
New Revision: 880

Modified:
   trunk/code/client/cl_main.c
   trunk/code/client/cl_parse.c
   trunk/code/client/client.h
   trunk/code/qcommon/common.c
   trunk/code/qcommon/files.c
   trunk/code/qcommon/qcommon.h
Log:
Go back to rev. 874. ATM, there is no good way to make FS_Restart() behave as it was originally described.


Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/client/cl_main.c	2006-08-28 01:48:38 UTC (rev 880)
@@ -1199,9 +1199,6 @@
 		CL_CloseAVI( );
 	}
 
-	if(clc.demorecording)
-		CL_StopRecord_f();
-
 	// don't let them loop during the restart
 	S_StopAllSounds();
 	// shutdown the UI

Modified: trunk/code/client/cl_parse.c
===================================================================
--- trunk/code/client/cl_parse.c	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/client/cl_parse.c	2006-08-28 01:48:38 UTC (rev 880)
@@ -482,15 +482,8 @@
 	// parse serverId and other cvars
 	CL_SystemInfoChanged();
 
-	// stop recording before FS_Restart closes the demo file
-	if(clc.demorecording)
-		CL_StopRecord_f();
-	// same fore AVI recording
-	if(CL_VideoRecording())
-		CL_CloseAVI();
-	
 	// reinitialize the filesystem if the game directory has changed
-	FS_ConditionalRestart( clc.checksumFeed );
+  FS_ConditionalRestart( clc.checksumFeed );
 
 	// This used to call CL_StartHunkUsers, but now we enter the download state before loading the
 	// cgame

Modified: trunk/code/client/client.h
===================================================================
--- trunk/code/client/client.h	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/client/client.h	2006-08-28 01:48:38 UTC (rev 880)
@@ -376,7 +376,6 @@
 void CL_StartDemoLoop( void );
 void CL_NextDemo( void );
 void CL_ReadDemoMessage( void );
-void CL_StopRecord_f(void);
 
 void CL_InitDownloads(void);
 void CL_NextDownload(void);

Modified: trunk/code/qcommon/common.c
===================================================================
--- trunk/code/qcommon/common.c	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/qcommon/common.c	2006-08-28 01:48:38 UTC (rev 880)
@@ -51,7 +51,8 @@
 jmp_buf abortframe;		// an ERR_DROP occured, exit the entire frame
 
 
-fileHandle_t	logfile;
+FILE *debuglogfile;
+static fileHandle_t logfile;
 fileHandle_t	com_journalFile;			// events are written here
 fileHandle_t	com_journalDataFile;		// config files are written here
 
@@ -261,6 +262,9 @@
 		code = ERR_FATAL;
 	}
 
+	// make sure we can get at our local stuff
+	FS_PureServerSetLoadedPaks( "", "" );
+
 	// if we are getting a solid stream of ERR_DROP, do an ERR_FATAL
 	currentTime = Sys_Milliseconds();
 	if ( currentTime - lastErrorTime < 100 ) {
@@ -288,8 +292,6 @@
 	if ( code == ERR_SERVERDISCONNECT ) {
 		CL_Disconnect( qtrue );
 		CL_FlushMemory( );
-		// make sure we can get at our local stuff
-		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_DROP || code == ERR_DISCONNECT ) {
@@ -297,7 +299,6 @@
 		SV_Shutdown (va("Server crashed: %s",  com_errorMessage));
 		CL_Disconnect( qtrue );
 		CL_FlushMemory( );
-		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_NEED_CD ) {
@@ -310,7 +311,6 @@
 		} else {
 			Com_Printf("Server didn't have CD\n" );
 		}
-		FS_PureServerSetLoadedPaks("", "");
 		longjmp (abortframe, -1);
 	} else {
 		CL_Shutdown ();

Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/qcommon/files.c	2006-08-28 01:48:38 UTC (rev 880)
@@ -2712,18 +2712,15 @@
 ================
 FS_Shutdown
 
-Frees all resources and closes all files
+Frees all resources.
 ================
 */
 void FS_Shutdown( qboolean closemfp ) {
 	searchpath_t	*p, *next;
 	int	i;
 
-	// logfile will now get closed.
-	logfile = 0;
-
 	for(i = 0; i < MAX_FILE_HANDLES; i++) {
-		if (fsh[i].handleFiles.file.o) {
+		if (fsh[i].fileSize) {
 			FS_FCloseFile(i);
 		}
 	}

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2006-08-28 01:10:46 UTC (rev 879)
+++ trunk/code/qcommon/qcommon.h	2006-08-28 01:48:38 UTC (rev 880)
@@ -776,7 +776,6 @@
 
 extern	qboolean	com_errorEntered;
 
-extern	fileHandle_t	logfile;
 extern	fileHandle_t	com_journalFile;
 extern	fileHandle_t	com_journalDataFile;