ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-14 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Displace the '\n's passed to SV_Shutdown

Browse source
This commit is contained in:
Tim Angus 2006-02-28 23:01:23 +00:00
parent ef4dad1875
commit 4ec0c94828
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/client/cl_main.c
View file

@ -1053,7 +1053,7 @@ void CL_Connect_f( void ) {
if ( com_sv_running->integer && !strcmp( server, "localhost" ) ) { if ( com_sv_running->integer && !strcmp( server, "localhost" ) ) {
// if running a local server, kill it // if running a local server, kill it
SV_Shutdown( "Server quit\n" ); SV_Shutdown( "Server quit" );
} }
// make sure a local server is killed // make sure a local server is killed

8
code/qcommon/common.c
View file

@ -283,13 +283,13 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
longjmp (abortframe, -1); longjmp (abortframe, -1);
} else if ( code == ERR_DROP || code == ERR_DISCONNECT ) { } else if ( code == ERR_DROP || code == ERR_DISCONNECT ) {
Com_Printf ("********************\nERROR: %s\n********************\n", com_errorMessage); 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_Disconnect( qtrue );
CL_FlushMemory( ); CL_FlushMemory( );
com_errorEntered = qfalse; com_errorEntered = qfalse;
longjmp (abortframe, -1); longjmp (abortframe, -1);
} else if ( code == ERR_NEED_CD ) { } 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 ) { if ( com_cl_running && com_cl_running->integer ) {
CL_Disconnect( qtrue ); CL_Disconnect( qtrue );
CL_FlushMemory( ); CL_FlushMemory( );
@ -301,7 +301,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
longjmp (abortframe, -1); longjmp (abortframe, -1);
} else { } else {
CL_Shutdown (); CL_Shutdown ();
SV_Shutdown (va("Server fatal crashed: %s\n", com_errorMessage)); SV_Shutdown (va("Server fatal crashed: %s", com_errorMessage));
} }
Com_Shutdown (); Com_Shutdown ();
@ -321,7 +321,7 @@ do the apropriate things.
void Com_Quit_f( void ) { void Com_Quit_f( void ) {
// don't try to shutdown if we are in a recursive error // don't try to shutdown if we are in a recursive error
if ( !com_errorEntered ) { if ( !com_errorEntered ) {
SV_Shutdown ("Server quit\n"); SV_Shutdown ("Server quit");
CL_Shutdown (); CL_Shutdown ();
Com_Shutdown (); Com_Shutdown ();
FS_Shutdown(qtrue); FS_Shutdown(qtrue);

2
code/server/sv_init.c
View file

@ -646,7 +646,7 @@ void SV_FinalMessage( char *message ) {
if (cl->state >= CS_CONNECTED) { if (cl->state >= CS_CONNECTED) {
// don't send a disconnect to a local client // don't send a disconnect to a local client
if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) { if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) {
SV_SendServerCommand( cl, "print \"%s\"", message ); SV_SendServerCommand( cl, "print \"%s\"\n", message );
SV_SendServerCommand( cl, "disconnect" ); SV_SendServerCommand( cl, "disconnect" );
} }
// force a snapshot to be sent // force a snapshot to be sent

2
code/server/sv_main.c
View file

@ -771,7 +771,7 @@ void SV_Frame( int msec ) {
// the menu kills the server with this cvar // the menu kills the server with this cvar
if ( sv_killserver->integer ) { if ( sv_killserver->integer ) {
SV_Shutdown ("Server was killed.\n"); SV_Shutdown ("Server was killed");
Cvar_Set( "sv_killserver", "0" ); Cvar_Set( "sv_killserver", "0" );
return; return;
} }