[quake3-commits] r2261 - in trunk/code: cgame game server ui

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Jun 18 12:16:57 EDT 2012


Author: ztm
Date: 2012-06-18 12:16:57 -0400 (Mon, 18 Jun 2012)
New Revision: 2261

Modified:
   trunk/code/cgame/cg_ents.c
   trunk/code/cgame/cg_main.c
   trunk/code/cgame/cg_particles.c
   trunk/code/game/g_mem.c
   trunk/code/server/sv_client.c
   trunk/code/server/sv_rankings.c
   trunk/code/ui/ui_main.c
Log:
add a missing '\n', remove some unwanted ones

>From /dev/humancontroller.

Modified: trunk/code/cgame/cg_ents.c
===================================================================
--- trunk/code/cgame/cg_ents.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/cgame/cg_ents.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -950,7 +950,7 @@
 
 	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:

Modified: trunk/code/cgame/cg_main.c
===================================================================
--- trunk/code/cgame/cg_main.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/cgame/cg_main.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -1442,12 +1442,12 @@
 		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;
 	}

Modified: trunk/code/cgame/cg_particles.c
===================================================================
--- trunk/code/cgame/cg_particles.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/cgame/cg_particles.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -1275,7 +1275,7 @@
 			break;
 	}
 	if (!shaderAnimNames[anim]) {
-		CG_Error("CG_ParticleExplosion: unknown animation string: %s\n", animStr);
+		CG_Error("CG_ParticleExplosion: unknown animation string: %s", animStr);
 		return;
 	}
 

Modified: trunk/code/game/g_mem.c
===================================================================
--- trunk/code/game/g_mem.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/game/g_mem.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -41,7 +41,7 @@
 	}
 
 	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;
 	}
 

Modified: trunk/code/server/sv_client.c
===================================================================
--- trunk/code/server/sv_client.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/server/sv_client.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -999,7 +999,7 @@
 			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 "

Modified: trunk/code/server/sv_rankings.c
===================================================================
--- trunk/code/server/sv_rankings.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/server/sv_rankings.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -1004,7 +1004,7 @@
 	}
 	else if( gr_newgame->status == GR_STATUS_BADLEAGUE )
 	{
-		SV_RankError( "SV_RankNewGameCBF: Invalid League name\n" );
+		SV_RankError( "SV_RankNewGameCBF: Invalid League name" );
 	}
 	else
 	{

Modified: trunk/code/ui/ui_main.c
===================================================================
--- trunk/code/ui/ui_main.c	2012-06-18 16:14:48 UTC (rev 2260)
+++ trunk/code/ui/ui_main.c	2012-06-18 16:16:57 UTC (rev 2261)
@@ -931,7 +931,7 @@
 		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!" ) );
 		}
 	}
 



More information about the quake3-commits mailing list