diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-28 23:01:23 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-28 23:01:23 +0000 |
| commit | 204285cfabc556c6e4317a6663c62962a0586008 (patch) | |
| tree | 7591f00291184ddc7683dc7866fcbbdf263fec22 | |
| parent | 9f1ff3ab1380f94ac155f97552dd0466f998f2f6 (diff) | |
| download | ioquake3-aero-204285cfabc556c6e4317a6663c62962a0586008.tar.gz ioquake3-aero-204285cfabc556c6e4317a6663c62962a0586008.zip | |
* Displace the '\n's passed to SV_Shutdown
git-svn-id: svn://svn.icculus.org/quake3/trunk@594 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/client/cl_main.c | 2 | ||||
| -rw-r--r-- | code/qcommon/common.c | 8 | ||||
| -rw-r--r-- | code/server/sv_init.c | 2 | ||||
| -rw-r--r-- | code/server/sv_main.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 6842281..9d89679 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -1053,7 +1053,7 @@ void CL_Connect_f( void ) { if ( com_sv_running->integer && !strcmp( server, "localhost" ) ) { // if running a local server, kill it - SV_Shutdown( "Server quit\n" ); + SV_Shutdown( "Server quit" ); } // make sure a local server is killed diff --git a/code/qcommon/common.c b/code/qcommon/common.c index a464125..1c37c5e 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -283,13 +283,13 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { longjmp (abortframe, -1); } else if ( code == ERR_DROP || code == ERR_DISCONNECT ) { Com_Printf ("********************\nERROR: %s\n********************\n", com_errorMessage); - SV_Shutdown (va("Server crashed: %s\n", com_errorMessage)); + SV_Shutdown (va("Server crashed: %s", com_errorMessage)); CL_Disconnect( qtrue ); CL_FlushMemory( ); com_errorEntered = qfalse; longjmp (abortframe, -1); } else if ( code == ERR_NEED_CD ) { - SV_Shutdown( "Server didn't have CD\n" ); + SV_Shutdown( "Server didn't have CD" ); if ( com_cl_running && com_cl_running->integer ) { CL_Disconnect( qtrue ); CL_FlushMemory( ); @@ -301,7 +301,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { longjmp (abortframe, -1); } else { CL_Shutdown (); - SV_Shutdown (va("Server fatal crashed: %s\n", com_errorMessage)); + SV_Shutdown (va("Server fatal crashed: %s", com_errorMessage)); } Com_Shutdown (); @@ -321,7 +321,7 @@ do the apropriate things. void Com_Quit_f( void ) { // don't try to shutdown if we are in a recursive error if ( !com_errorEntered ) { - SV_Shutdown ("Server quit\n"); + SV_Shutdown ("Server quit"); CL_Shutdown (); Com_Shutdown (); FS_Shutdown(qtrue); diff --git a/code/server/sv_init.c b/code/server/sv_init.c index 02bd910..92dd6ad 100644 --- a/code/server/sv_init.c +++ b/code/server/sv_init.c @@ -646,7 +646,7 @@ void SV_FinalMessage( char *message ) { if (cl->state >= CS_CONNECTED) { // don't send a disconnect to a local client if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) { - SV_SendServerCommand( cl, "print \"%s\"", message ); + SV_SendServerCommand( cl, "print \"%s\"\n", message ); SV_SendServerCommand( cl, "disconnect" ); } // force a snapshot to be sent diff --git a/code/server/sv_main.c b/code/server/sv_main.c index e0d6f01..84c2e52 100644 --- a/code/server/sv_main.c +++ b/code/server/sv_main.c @@ -771,7 +771,7 @@ void SV_Frame( int msec ) { // the menu kills the server with this cvar if ( sv_killserver->integer ) { - SV_Shutdown ("Server was killed.\n"); + SV_Shutdown ("Server was killed"); Cvar_Set( "sv_killserver", "0" ); return; } |