From a4c61d874d2b5e27f8bccc9a07592133c3e11df6 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 18 Jun 2012 16:16:57 +0000 Subject: [PATCH] add a missing '\n', remove some unwanted ones From /dev/humancontroller. --- code/cgame/cg_ents.c | 2 +- code/cgame/cg_main.c | 4 ++-- code/cgame/cg_particles.c | 2 +- code/game/g_mem.c | 2 +- code/server/sv_client.c | 2 +- code/server/sv_rankings.c | 2 +- code/ui/ui_main.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/cgame/cg_ents.c b/code/cgame/cg_ents.c index 83a5332f..2de21797 100644 --- a/code/cgame/cg_ents.c +++ b/code/cgame/cg_ents.c @@ -950,7 +950,7 @@ static void CG_AddCEntity( centity_t *cent ) { switch ( cent->currentState.eType ) { default: - CG_Error( "Bad entity type: %i\n", cent->currentState.eType ); + CG_Error( "Bad entity type: %i", cent->currentState.eType ); break; case ET_INVISIBLE: case ET_PUSH_TRIGGER: diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 6bed3da2..8b3403f2 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -1442,12 +1442,12 @@ void CG_LoadMenus(const char *menuFile) { Com_Printf( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile ); len = trap_FS_FOpenFile( "ui/hud.txt", &f, FS_READ ); if (!f) { - trap_Error( va( S_COLOR_RED "default menu file not found: ui/hud.txt, unable to continue!\n") ); + trap_Error( va( S_COLOR_RED "default menu file not found: ui/hud.txt, unable to continue!" ) ); } } if ( len >= MAX_MENUDEFFILE ) { - trap_Error( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i\n", menuFile, len, MAX_MENUDEFFILE ) ); + trap_Error( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", menuFile, len, MAX_MENUDEFFILE ) ); trap_FS_FCloseFile( f ); return; } diff --git a/code/cgame/cg_particles.c b/code/cgame/cg_particles.c index d421e3d8..1cd72dc0 100644 --- a/code/cgame/cg_particles.c +++ b/code/cgame/cg_particles.c @@ -1275,7 +1275,7 @@ void CG_ParticleExplosion (char *animStr, vec3_t origin, vec3_t vel, int duratio break; } if (!shaderAnimNames[anim]) { - CG_Error("CG_ParticleExplosion: unknown animation string: %s\n", animStr); + CG_Error("CG_ParticleExplosion: unknown animation string: %s", animStr); return; } diff --git a/code/game/g_mem.c b/code/game/g_mem.c index dbeb301c..4dc598bb 100644 --- a/code/game/g_mem.c +++ b/code/game/g_mem.c @@ -41,7 +41,7 @@ void *G_Alloc( int size ) { } if ( allocPoint + size > POOLSIZE ) { - G_Error( "G_Alloc: failed on allocation of %i bytes\n", size ); + G_Error( "G_Alloc: failed on allocation of %i bytes", size ); return NULL; } diff --git a/code/server/sv_client.c b/code/server/sv_client.c index 0326782b..35b434c0 100644 --- a/code/server/sv_client.c +++ b/code/server/sv_client.c @@ -999,7 +999,7 @@ int SV_WriteDownloadToClient(client_t *cl, msg_t *msg) else if ( !(sv_allowDownload->integer & DLF_ENABLE) || (sv_allowDownload->integer & DLF_NO_UDP) ) { - Com_Printf("clientDownload: %d : \"%s\" download disabled", (int) (cl - svs.clients), cl->downloadName); + Com_Printf("clientDownload: %d : \"%s\" download disabled\n", (int) (cl - svs.clients), cl->downloadName); if (sv_pure->integer) { Com_sprintf(errorMessage, sizeof(errorMessage), "Could not download \"%s\" because autodownloading is disabled on the server.\n\n" "You will need to get this file elsewhere before you " diff --git a/code/server/sv_rankings.c b/code/server/sv_rankings.c index 6ca9d5b4..9eb2e9b2 100644 --- a/code/server/sv_rankings.c +++ b/code/server/sv_rankings.c @@ -1004,7 +1004,7 @@ static void SV_RankNewGameCBF( GR_NEWGAME* gr_newgame, void* cbf_arg ) } else if( gr_newgame->status == GR_STATUS_BADLEAGUE ) { - SV_RankError( "SV_RankNewGameCBF: Invalid League name\n" ); + SV_RankError( "SV_RankNewGameCBF: Invalid League name" ); } else { diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c index e887c8cb..7e7e2421 100644 --- a/code/ui/ui_main.c +++ b/code/ui/ui_main.c @@ -931,7 +931,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset) { Com_Printf( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile ); handle = trap_PC_LoadSource( "ui/menus.txt" ); if (!handle) { - trap_Error( va( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!\n") ); + trap_Error( va( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!" ) ); } }