Make CL_Disconnect receive only error type as an argument.

7 files changed, 12 insertions, 12 deletions

diff --git a/src/cl_demo.c b/src/cl_demo.c
index d6c08a5..8a91f7a 100644
--- a/src/cl_demo.c
+++ b/src/cl_demo.c
@@ -678,7 +678,7 @@ fail:
     // if running a local server, kill it and reissue
     SV_Shutdown( "Server was killed.\n", ERR_DISCONNECT );
 
-    CL_Disconnect( ERR_DISCONNECT, NULL );
+    CL_Disconnect( ERR_DISCONNECT );
 
     cls.demo.playback = demofile;
     cls.state = ca_connected;
diff --git a/src/cl_keys.c b/src/cl_keys.c
index 9f20ccd..c376439 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_DISCONNECT, NULL );
+                CL_Disconnect( ERR_DISCONNECT );
             }
             return;
         }
diff --git a/src/cl_local.h b/src/cl_local.h
index 953bea6..6d2d5f6 100644
--- a/src/cl_local.h
+++ b/src/cl_local.h
@@ -440,7 +440,7 @@ extern cvar_t    *info_uf;
 
 void CL_Init (void);
 void CL_Quit_f (void);
-void CL_Disconnect( error_type_t type, const char *text );
+void CL_Disconnect( error_type_t type );
 void CL_RequestNextDownload (void);
 void CL_ResetPrecacheCheck( void );
 void CL_CheckForResend( void );
diff --git a/src/cl_main.c b/src/cl_main.c
index 25bae16..8d90b06 100644
--- a/src/cl_main.c
+++ b/src/cl_main.c
@@ -450,7 +450,7 @@ usage:
 
     NET_Config( NET_CLIENT );
 
-    CL_Disconnect( ERR_DISCONNECT, NULL );
+    CL_Disconnect( ERR_DISCONNECT );
 
     cls.serverAddress = address;
     cls.serverProtocol = protocol;
@@ -486,7 +486,7 @@ static void CL_PassiveConnect_f( void ) {
 
     NET_Config( NET_CLIENT );
 
-    CL_Disconnect( ERR_DISCONNECT, NULL );
+    CL_Disconnect( ERR_DISCONNECT );
 
     if( !NET_GetAddress( NS_CLIENT, &address ) ) {
         return;
@@ -585,7 +585,7 @@ Sends a disconnect message to the server
 This is also called on Com_Error, so it shouldn't cause any errors
 =====================
 */
-void CL_Disconnect( error_type_t type, const char *text ) {
+void CL_Disconnect( error_type_t type ) {
     if( !cls.state ) {
         return;
     }
@@ -1006,7 +1006,7 @@ The server is changing levels
 */
 static void CL_Reconnect_f( void ) {
     if( cls.state >= ca_precached ) {
-        CL_Disconnect( ERR_DISCONNECT, NULL );
+        CL_Disconnect( ERR_DISCONNECT );
     }
 
     if( cls.state >= ca_connected ) {
@@ -3260,7 +3260,7 @@ void CL_Shutdown( void ) {
         return;
     }
 
-    CL_Disconnect( ERR_DISCONNECT, NULL );
+    CL_Disconnect( ERR_DISCONNECT );
 
 #if USE_ZLIB
     inflateEnd( &cls.z );
diff --git a/src/cl_public.h b/src/cl_public.h
index 577322b..0f7571c 100644
--- a/src/cl_public.h
+++ b/src/cl_public.h
@@ -53,7 +53,7 @@ void CL_ProcessEvents( void );
 void CL_ErrorEvent( void );
 #endif
 void CL_Init (void);
-void CL_Disconnect( error_type_t type, const char *text );
+void CL_Disconnect( error_type_t type );
 void CL_Shutdown (void);
 unsigned CL_Frame (unsigned msec);
 void CL_RestartFilesystem( qboolean total );
diff --git a/src/common.c b/src/common.c
index 5b40fed..d48dd01 100644
--- a/src/common.c
+++ b/src/common.c
@@ -480,7 +480,7 @@ void Com_Error( error_type_t code, const char *fmt, ... ) {
         Com_WPrintf( "%s\n", com_errorMsg );
         SV_Shutdown( va( "Server was killed: %s", com_errorMsg ), code );
 #if USE_CLIENT
-        CL_Disconnect( code, com_errorMsg );
+        CL_Disconnect( code );
 #endif
         goto abort;
     }
@@ -502,7 +502,7 @@ void Com_Error( error_type_t code, const char *fmt, ... ) {
                      "********************\n", com_errorMsg );
         SV_Shutdown( va( "Server crashed: %s\n", com_errorMsg ), ERR_DROP );
 #if USE_CLIENT
-        CL_Disconnect( ERR_DROP, com_errorMsg );
+        CL_Disconnect( ERR_DROP );
 #endif
         goto abort;
     }
diff --git a/src/sv_init.c b/src/sv_init.c
index bd647e7..bba7354 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_DISCONNECT, NULL );
+        CL_Disconnect( ERR_DISCONNECT );
         SCR_BeginLoadingPlaque();
 #endif