From e76c833cb93e9d52ab85e6a83e86d09a5e3727e3 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Thu, 4 Oct 2012 14:43:32 +0000 Subject: [PATCH] IOQ3 commit 2261 --- reaction/code/cgame/cg_ents.c | 2 +- reaction/code/cgame/cg_particles.c | 2 +- reaction/code/game/g_mem.c | 2 +- reaction/code/server/sv_client.c | 2 +- reaction/code/server/sv_rankings.c | 2 +- reaction/code/ui/ui_main.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reaction/code/cgame/cg_ents.c b/reaction/code/cgame/cg_ents.c index eb877e31..be4bd977 100644 --- a/reaction/code/cgame/cg_ents.c +++ b/reaction/code/cgame/cg_ents.c @@ -1176,7 +1176,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/reaction/code/cgame/cg_particles.c b/reaction/code/cgame/cg_particles.c index f4bbd335..b0eaebc1 100644 --- a/reaction/code/cgame/cg_particles.c +++ b/reaction/code/cgame/cg_particles.c @@ -1183,7 +1183,7 @@ void CG_ParticleExplosion(char *animStr, vec3_t origin, vec3_t vel, int duration 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/reaction/code/game/g_mem.c b/reaction/code/game/g_mem.c index a63fc6e5..116f579e 100644 --- a/reaction/code/game/g_mem.c +++ b/reaction/code/game/g_mem.c @@ -38,7 +38,7 @@ void *G_Alloc(int size) } if (allocPoint + size > POOLSIZE) { - G_Error("G_Alloc: failed on allocation of %i bytes\n", size); // bk010103 - was %u, but is signed + G_Error("G_Alloc: failed on allocation of %i bytes", size); return NULL; } diff --git a/reaction/code/server/sv_client.c b/reaction/code/server/sv_client.c index 0326782b..35b434c0 100644 --- a/reaction/code/server/sv_client.c +++ b/reaction/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/reaction/code/server/sv_rankings.c b/reaction/code/server/sv_rankings.c index 6ca9d5b4..9eb2e9b2 100644 --- a/reaction/code/server/sv_rankings.c +++ b/reaction/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/reaction/code/ui/ui_main.c b/reaction/code/ui/ui_main.c index 1c162347..6afaf087 100644 --- a/reaction/code/ui/ui_main.c +++ b/reaction/code/ui/ui_main.c @@ -2003,7 +2003,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset) 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")); + (S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!")); } }