diff options
| -rw-r--r-- | source/cl_main.c | 11 | ||||
| -rw-r--r-- | source/cl_null.c | 6 | ||||
| -rw-r--r-- | source/cl_public.h | 1 | ||||
| -rw-r--r-- | source/sv_init.c | 9 |
4 files changed, 8 insertions, 19 deletions
diff --git a/source/cl_main.c b/source/cl_main.c index 0c5d93d..26288da 100644 --- a/source/cl_main.c +++ b/source/cl_main.c @@ -2390,17 +2390,6 @@ static void CL_RestartRefresh_f( void ) { CL_RestartRefresh( qtrue ); } -/* -============ -CL_LocalConnect -============ -*/ -void CL_LocalConnect( void ) { - if ( FS_NeedRestart() ) { - CL_RestartFilesystem( qfalse ); - } -} - // execute string in server command buffer static void exec_server_string( cmdbuf_t *buf, const char *text ) { char *s; diff --git a/source/cl_null.c b/source/cl_null.c index e897cee..8a0c3b9 100644 --- a/source/cl_null.c +++ b/source/cl_null.c @@ -32,12 +32,6 @@ qboolean CL_CheatsOK( void ) { return qfalse; } -void CL_LocalConnect( void ) { - if( FS_NeedRestart() ) { - FS_Restart(); - } -} - static void Key_Bind_Null_f( void ) { } diff --git a/source/cl_public.h b/source/cl_public.h index 965d4cc..f965545 100644 --- a/source/cl_public.h +++ b/source/cl_public.h @@ -55,7 +55,6 @@ void CL_Init (void); void CL_Disconnect( error_type_t type, const char *text ); void CL_Shutdown (void); void CL_Frame (unsigned msec); -void CL_LocalConnect( void ); void CL_RestartFilesystem( qboolean total ); void CL_Activate( active_t active ); void CL_UpdateUserinfo( cvar_t *var, from_t from ); diff --git a/source/sv_init.c b/source/sv_init.c index b8b0090..339ac4b 100644 --- a/source/sv_init.c +++ b/source/sv_init.c @@ -188,7 +188,14 @@ void SV_InitGame( qboolean ismvd ) { Cvar_Reset( sv_recycle ); #endif - CL_LocalConnect(); + // restart filesystem now + if( FS_NeedRestart() ) { +#if USE_CLIENT + CL_RestartFilesystem( qfalse ); +#else + FS_Restart( qfalse ); +#endif + } if( ismvd ) { Cvar_Set( "deathmatch", "1" ); |