diff options
| -rw-r--r-- | code/client/cl_main.c | 3 | ||||
| -rw-r--r-- | code/client/cl_parse.c | 9 | ||||
| -rw-r--r-- | code/client/client.h | 1 | ||||
| -rw-r--r-- | code/qcommon/common.c | 10 | ||||
| -rw-r--r-- | code/qcommon/files.c | 7 | ||||
| -rw-r--r-- | code/qcommon/qcommon.h | 1 |
6 files changed, 8 insertions, 23 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 6fc4cab..2df8cb1 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -1199,9 +1199,6 @@ void CL_Vid_Restart_f( void ) { CL_CloseAVI( ); } - if(clc.demorecording) - CL_StopRecord_f(); - // don't let them loop during the restart S_StopAllSounds(); // shutdown the UI diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c index e6b655a..d8ad6d7 100644 --- a/code/client/cl_parse.c +++ b/code/client/cl_parse.c @@ -482,15 +482,8 @@ void CL_ParseGamestate( msg_t *msg ) { // 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 diff --git a/code/client/client.h b/code/client/client.h index 89ea4c6..9db786a 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -376,7 +376,6 @@ void CL_Snd_Restart_f (void); 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); diff --git a/code/qcommon/common.c b/code/qcommon/common.c index f3a2360..438f049 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -51,7 +51,8 @@ char *com_argv[MAX_NUM_ARGVS+1]; 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 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { 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 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { 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 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { 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 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { } else { Com_Printf("Server didn't have CD\n" ); } - FS_PureServerSetLoadedPaks("", ""); longjmp (abortframe, -1); } else { CL_Shutdown (); diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 3412035..52fa912 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2712,18 +2712,15 @@ qboolean FS_ComparePaks( char *neededpaks, int len, qboolean dlstring ) { ================ 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); } } diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index f4f1a69..3c53ae0 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -776,7 +776,6 @@ extern int com_frameMsec; extern qboolean com_errorEntered; -extern fileHandle_t logfile; extern fileHandle_t com_journalFile; extern fileHandle_t com_journalDataFile; |