diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cl_demo.c | 2 | ||||
| -rw-r--r-- | src/cl_keys.c | 2 | ||||
| -rw-r--r-- | src/cl_main.c | 7 | ||||
| -rw-r--r-- | src/common.c | 2 | ||||
| -rw-r--r-- | src/q_shared.h | 1 | ||||
| -rw-r--r-- | src/sv_init.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/cl_demo.c b/src/cl_demo.c index ad7a256..95f12ad 100644 --- a/src/cl_demo.c +++ b/src/cl_demo.c @@ -575,7 +575,7 @@ static void parse_next_message( void ) { if( !s[0] ) { if( ret == 0 ) { - Com_Error( ERR_SILENT, "Demo finished" ); + Com_Error( ERR_DISCONNECT, "Demo finished" ); } else { Com_Error( ERR_DROP, "Couldn't read demo: %s", Q_ErrorString( ret ) ); } diff --git a/src/cl_keys.c b/src/cl_keys.c index e5c8522..9f20ccd 100644 --- a/src/cl_keys.c +++ b/src/cl_keys.c @@ -696,7 +696,7 @@ void Key_Event( unsigned key, qboolean down, unsigned time ) { if( cls.key_dest & KEY_CONSOLE ) { Con_Close(); } else { - CL_Disconnect( ERR_SILENT, NULL ); + CL_Disconnect( ERR_DISCONNECT, NULL ); } return; } diff --git a/src/cl_main.c b/src/cl_main.c index cb6734c..dac3d5c 100644 --- a/src/cl_main.c +++ b/src/cl_main.c @@ -674,7 +674,7 @@ CL_Disconnect_f */ static void CL_Disconnect_f( void ) { if( cls.state > ca_disconnected ) { - Com_Error( ERR_SILENT, "Disconnected from server" ); + Com_Error( ERR_DISCONNECT, "Disconnected from server" ); } } @@ -1006,8 +1006,9 @@ The server is changing levels */ static void CL_Reconnect_f( void ) { if( cls.state >= ca_precached ) { - CL_Disconnect( ERR_SILENT, NULL ); + CL_Disconnect( ERR_DISCONNECT, NULL ); } + if( cls.state >= ca_connected ) { cls.state = ca_connected; @@ -3259,7 +3260,7 @@ void CL_Shutdown( void ) { return; } - CL_Disconnect( ERR_SILENT, NULL ); + CL_Disconnect( ERR_DISCONNECT, NULL ); #if USE_ZLIB inflateEnd( &cls.z ); diff --git a/src/common.c b/src/common.c index 086a6b9..a8ca792 100644 --- a/src/common.c +++ b/src/common.c @@ -476,7 +476,7 @@ void Com_Error( error_type_t code, const char *fmt, ... ) { X86_POP_FPCW; - if( code == ERR_DISCONNECT || code == ERR_SILENT ) { + if( code == ERR_DISCONNECT ) { Com_WPrintf( "%s\n", com_errorMsg ); SV_Shutdown( va( "Server was killed: %s", com_errorMsg ), KILL_DISCONNECT ); diff --git a/src/q_shared.h b/src/q_shared.h index fa9a812..790049c 100644 --- a/src/q_shared.h +++ b/src/q_shared.h @@ -121,7 +121,6 @@ typedef enum { ERR_FATAL, // exit the entire game with a popup window ERR_DROP, // print to console and disconnect from game ERR_DISCONNECT, // don't kill server - ERR_SILENT } error_type_t; typedef enum { diff --git a/src/sv_init.c b/src/sv_init.c index 033b3dd..402f23a 100644 --- a/src/sv_init.c +++ b/src/sv_init.c @@ -208,7 +208,7 @@ void SV_InitGame( qboolean ismvd ) { } else { #if USE_CLIENT // make sure the client is down - CL_Disconnect( ERR_SILENT, NULL ); + CL_Disconnect( ERR_DISCONNECT, NULL ); SCR_BeginLoadingPlaque(); #endif |