summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2014-07-13 19:15:19 +0200
committer/dev/humancontroller <devhc@example.com>2017-03-09 13:51:13 +0100
commit80b099b6573aa7a234cafd0d2430b95fbf839f49 (patch)
treea684b8ef8c9afab18e8f28341cc8b397e1edb36b
parent0c7b64fd8051a123864b8fe813d845bfa2b066cf (diff)
remove some '\n's from strings passed to error calls
-rw-r--r--src/cgame/cg_draw.c2
-rw-r--r--src/cgame/cg_ents.c2
-rw-r--r--src/cgame/cg_main.c4
-rw-r--r--src/game/bg_voice.c4
-rw-r--r--src/game/g_client.c2
-rw-r--r--src/ui/ui_main.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index c334490d..4d70b343 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -2463,7 +2463,7 @@ void CG_DrawWeaponIcon( rectDef_t *rect, vec4_t color )
if( weapon <= WP_NONE || weapon >= WP_NUM_WEAPONS )
{
- CG_Error( "CG_DrawWeaponIcon: weapon out of range: %d\n", weapon );
+ CG_Error( "CG_DrawWeaponIcon: weapon out of range: %d", weapon );
return;
}
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index 48545715..d32318e7 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -1086,7 +1086,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:
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 6699fa1f..99d267ee 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1438,11 +1438,11 @@ void CG_LoadMenus( const char *menuFile )
if( !f )
{
- trap_Error( va( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile ) );
+ trap_Error( va( S_COLOR_YELLOW "menu file not found: %s, using default", 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 )
diff --git a/src/game/bg_voice.c b/src/game/bg_voice.c
index 828219aa..44cfd17f 100644
--- a/src/game/bg_voice.c
+++ b/src/game/bg_voice.c
@@ -378,7 +378,7 @@ static voiceCmd_t *BG_VoiceParse( char *name )
trap_Parse_SourceFileAndLine( handle, filename, &line );
Com_Error( ERR_FATAL, "BG_VoiceParse(): "
- "parse error on line %d of %s\n", line, filename );
+ "parse error on line %d of %s", line, filename );
}
}
@@ -389,7 +389,7 @@ static voiceCmd_t *BG_VoiceParse( char *name )
trap_Parse_SourceFileAndLine( handle, filename, &line );
Com_Error( ERR_FATAL, "BG_VoiceParse(): "
- "command \"%s\" exceeds MAX_VOICE_CMD_LEN (%d) on line %d of %s\n",
+ "command \"%s\" exceeds MAX_VOICE_CMD_LEN (%d) on line %d of %s",
token.string, MAX_VOICE_CMD_LEN, line, filename );
}
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 5156b3e1..b8439312 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1258,7 +1258,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
{
if( spawn == NULL )
{
- G_Error( "ClientSpawn: spawn is NULL\n" );
+ G_Error( "ClientSpawn: spawn is NULL" );
return;
}
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 3932b1e0..a542e642 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -1449,7 +1449,7 @@ void UI_LoadMenus( const char *menuFile, qboolean reset )
handle = trap_Parse_LoadSource( menuFile );
if( !handle )
- trap_Error( va( S_COLOR_RED "menu list '%s' not found, unable to continue!\n", menuFile ) );
+ trap_Error( va( S_COLOR_RED "menu list '%s' not found, unable to continue!", menuFile ) );
if( reset )
Menu_Reset();