From 09c87ea0cc4676b556078db5871c9f22e6d861ae Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Tue, 19 Oct 2010 13:34:08 +0000
Subject: [PATCH] Reformatiere die Startup Ausgabe

---
 TODO                       | 1 +
 src/client/sound/snd_dma.c | 2 +-
 src/common/misc.c          | 3 ++-
 src/game/baseq2/g_save.c   | 3 ++-
 src/game/baseq2/g_spawn.c  | 4 ++--
 src/game/ctf/g_save.c      | 3 ++-
 src/game/ctf/g_spawn.c     | 4 ++--
 src/refresh/gl_rmain.c     | 1 +
 src/sdl/refresh.c          | 9 ++++-----
 src/sdl/sound.c            | 6 +++---
 src/server/sv_game.c       | 3 +++
 src/server/sv_init.c       | 4 ++--
 src/unix/misc.c            | 3 ++-
 src/unix/qgl.c             | 4 ++--
 src/unix/system.c          | 2 +-
 src/unix/vid.c             | 4 ++--
 16 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/TODO b/TODO
index 652e13a6..2b3907b5 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,7 @@ Allgemein:
 - Wieso durchläuft der Client seine Shutdown-Rotine doppelt? Bekommen
   wir es evtl hin, das sie auch rekursiv nicht mehr aufgerufen wird?
 - Noch mal uncrustify über client/, common/, unix/ und sdl/
+- ====InitGame=== in allen Spielen ändern
 
 Unix / SDL:
 - SDL GL-Backend refresh.c komplett neuschreiben
diff --git a/src/client/sound/snd_dma.c b/src/client/sound/snd_dma.c
index 74ee5071..eb70cfd0 100644
--- a/src/client/sound/snd_dma.c
+++ b/src/client/sound/snd_dma.c
@@ -153,7 +153,7 @@ S_Init ( void )
 		OGG_Init();
 	}
 
-	Com_Printf( "------------------------------------\n" );
+	Com_Printf( "------------------------------------\n\n" );
 }
 
 /*
diff --git a/src/common/misc.c b/src/common/misc.c
index 0a6c440e..d9cb1335 100644
--- a/src/common/misc.c
+++ b/src/common/misc.c
@@ -275,7 +275,8 @@ void Qcommon_Init (int argc, char **argv)
 
 #endif
 
-	Com_Printf ("====== Quake2 Initialized ======\n\n");
+	Com_Printf ("==== Yamagi Quake II Initialized ====\n\n");
+	Com_Printf ("*************************************\n\n");
 }
 
 void Qcommon_Frame (int msec)
diff --git a/src/game/baseq2/g_save.c b/src/game/baseq2/g_save.c
index 2fed9ac5..96d32095 100644
--- a/src/game/baseq2/g_save.c
+++ b/src/game/baseq2/g_save.c
@@ -151,7 +151,8 @@ is loaded.
 */
 void InitGame (void)
 {
-	gi.dprintf ("==== InitGame ====\n");
+	gi.dprintf ("Game is starting up.\n");
+	gi.dprintf ("Game is baseq2.\n");
 
 	gun_x = gi.cvar ("gun_x", "0", 0);
 	gun_y = gi.cvar ("gun_y", "0", 0);
diff --git a/src/game/baseq2/g_spawn.c b/src/game/baseq2/g_spawn.c
index 341c1b34..b72319f2 100644
--- a/src/game/baseq2/g_spawn.c
+++ b/src/game/baseq2/g_spawn.c
@@ -505,7 +505,7 @@ void G_FindTeams (void)
 		}
 	}
 
-	gi.dprintf ("%i teams with %i entities\n", c, c2);
+	gi.dprintf ("%i teams with %i entities.\n", c, c2);
 }
 
 /*
@@ -601,7 +601,7 @@ void SpawnEntities (const char *mapname, char *entities, const char *spawnpoint)
 		ED_CallSpawn (ent);
 	}	
 
-	gi.dprintf ("%i entities inhibited\n", inhibit);
+	gi.dprintf ("%i entities inhibited\n.", inhibit);
 
 	G_FindTeams ();
 
diff --git a/src/game/ctf/g_save.c b/src/game/ctf/g_save.c
index 66a580a9..8f5623f0 100644
--- a/src/game/ctf/g_save.c
+++ b/src/game/ctf/g_save.c
@@ -146,7 +146,8 @@ is loaded.
 */
 void InitGame (void)
 {
-	gi.dprintf ("==== InitGame ====\n");
+	gi.dprintf ("Game is starting up.\n");
+	gi.dprintf ("Game is ctf.\n");
 
 	gun_x = gi.cvar ("gun_x", "0", 0);
 	gun_y = gi.cvar ("gun_y", "0", 0);
diff --git a/src/game/ctf/g_spawn.c b/src/game/ctf/g_spawn.c
index 20e85966..b4341d31 100644
--- a/src/game/ctf/g_spawn.c
+++ b/src/game/ctf/g_spawn.c
@@ -487,7 +487,7 @@ void G_FindTeams (void)
 		}
 	}
 
-	gi.dprintf ("%i teams with %i entities\n", c, c2);
+	gi.dprintf ("%i teams with %i entities.\n", c, c2);
 }
 
 /*
@@ -583,7 +583,7 @@ void SpawnEntities (char *mapname, char *entities, char *spawnpoint)
 		ED_CallSpawn (ent);
 	}	
 
-	gi.dprintf ("%i entities inhibited\n", inhibit);
+	gi.dprintf ("%i entities inhibited.\n", inhibit);
 
 	G_FindTeams ();
 
diff --git a/src/refresh/gl_rmain.c b/src/refresh/gl_rmain.c
index ef0deee1..8af98479 100644
--- a/src/refresh/gl_rmain.c
+++ b/src/refresh/gl_rmain.c
@@ -1085,6 +1085,7 @@ int R_Init( void *hinstance, void *hWnd )
 	/*
 	** get our various GL strings
 	*/
+	ri.Con_Printf (PRINT_ALL, "\nOpenGL setting:\n", gl_config.vendor_string );
 	gl_config.vendor_string = (char *)qglGetString (GL_VENDOR);
 	ri.Con_Printf (PRINT_ALL, "GL_VENDOR: %s\n", gl_config.vendor_string );
 	gl_config.renderer_string = (char *)qglGetString (GL_RENDERER);
diff --git a/src/sdl/refresh.c b/src/sdl/refresh.c
index 2d270d6f..d9c89550 100644
--- a/src/sdl/refresh.c
+++ b/src/sdl/refresh.c
@@ -49,11 +49,11 @@ int GLimp_Init(void)
 
         if (SDL_Init(SDL_INIT_VIDEO) == -1)
         {
-			ri.Con_Printf( PRINT_ALL, "\nSDL_Init( SDL_INIT_VIDEO ) FAILED (%s)\n", SDL_GetError());
+			ri.Con_Printf( PRINT_ALL, "Couldn't init SDL video: %s.\n", SDL_GetError());
             return false;
         }
 		SDL_VideoDriverName( driverName, sizeof( driverName ) - 1 );
-        ri.Con_Printf( PRINT_ALL, "\nSDL using driver \"%s\"\n", driverName );
+        ri.Con_Printf( PRINT_ALL, "SDL video driver is \"%s\".\n", driverName );
 	}
 
 	return true;
@@ -187,7 +187,7 @@ static qboolean GLimp_InitGraphics( qboolean fullscreen )
 	/* Initialize the stencil buffer */
 	if (!SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &stencil_bits)) 
 	{
-		ri.Con_Printf(PRINT_ALL, "I: got %d bits of stencil\n", stencil_bits);
+		ri.Con_Printf(PRINT_ALL, "Got %d bits of stencil\n.", stencil_bits);
 		
 		if (stencil_bits >= 1) 
 		{
@@ -198,8 +198,7 @@ static qboolean GLimp_InitGraphics( qboolean fullscreen )
 	/* Initialize hardware gamma */
 	gl_state.hwgamma = true;
 	vid_gamma->modified = true;
-	ri.Con_Printf(PRINT_ALL, "Using hardware gamma\n");
-	ri.Con_Printf(PRINT_ALL, "If this doesn't work your X11 driver is broken!\n");
+	ri.Con_Printf(PRINT_ALL, "Using hardware gamma.\n");
 
 	/* Window title */
 	SDL_WM_SetCaption("Yamagi Quake II", "Yamagi Quake II");
diff --git a/src/sdl/sound.c b/src/sdl/sound.c
index ecd7b313..07ee6974 100644
--- a/src/sdl/sound.c
+++ b/src/sdl/sound.c
@@ -114,7 +114,7 @@ SNDDMA_Init(void)
 	{
 		if (SDL_Init(SDL_INIT_AUDIO) == -1)
 		{
-			Com_Printf ("Couldn't init SDL audio: %s\n", SDL_GetError ());
+			Com_Printf ("Couldn't init SDL audio: %s.\n", SDL_GetError ());
 			return 0;
 		}
 	}
@@ -124,7 +124,7 @@ SNDDMA_Init(void)
 		strcpy(drivername, "(UNKNOW)");
 	}
 
-	Com_Printf("SDL audio driver is \"%s\"\n", drivername);
+	Com_Printf("SDL audio driver is \"%s\".\n", drivername);
 
 	memset(&desired, '\0', sizeof(desired));
 	memset(&optained, '\0', sizeof(optained));
@@ -182,7 +182,7 @@ SNDDMA_Init(void)
 	dmasize = (dmabackend->samples * (dmabackend->samplebits / 8));
 	dmabackend->buffer = calloc(1, dmasize);
 
-	Com_Printf("Starting SDL audio callback...\n");
+	Com_Printf("Starting SDL audio callback.\n");
     SDL_PauseAudio(0);
 
     Com_Printf("SDL audio initialized.\n");
diff --git a/src/server/sv_game.c b/src/server/sv_game.c
index 718978e4..893f1220 100644
--- a/src/server/sv_game.c
+++ b/src/server/sv_game.c
@@ -331,6 +331,7 @@ void SV_InitGameProgs (void)
 	if (ge)
 		SV_ShutdownGameProgs ();
 
+	Com_Printf( "-------- game initialization -------\n" );
 
 	// load a new game dll
 	import.multicast = SV_Multicast;
@@ -398,5 +399,7 @@ void SV_InitGameProgs (void)
 		GAME_API_VERSION);
 
 	ge->Init ();
+
+	Com_Printf("------------------------------------\n\n");
 }
 
diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 398d430f..61724d3e 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -173,7 +173,7 @@ void SV_SpawnServer (char *server, char *spawnpoint, server_state_t serverstate,
 	if (attractloop)
 		Cvar_Set ("paused", "0");
 
-	Com_Printf ("------- Server Initialization -------\n");
+	Com_Printf ("------- server initialization ------\n");
 
 	Com_DPrintf ("SpawnServer: %s\n",server);
 	if (sv.demofile)
@@ -280,7 +280,7 @@ void SV_SpawnServer (char *server, char *spawnpoint, server_state_t serverstate,
 	Cvar_FullSet ("mapname", sv.name, CVAR_SERVERINFO | CVAR_NOSET);
 	Cvar_SetValue("windowed_mouse", 1); 
 
-	Com_Printf ("-------------------------------------\n");
+	Com_Printf ("-------------------------------------\n\n");
 }
 
 /*
diff --git a/src/unix/misc.c b/src/unix/misc.c
index b4aec0bb..96edcc5b 100644
--- a/src/unix/misc.c
+++ b/src/unix/misc.c
@@ -58,7 +58,8 @@ main ( int argc, char **argv )
 	saved_euid = geteuid();
 	seteuid( getuid() );
 
-	printf( "Quake 2\n" );
+	printf( "\nYamagi Quake II v%4.2f\n", VERSION);
+	printf( "=====================\n\n");
 
 	Qcommon_Init( argc, argv );
 
diff --git a/src/unix/qgl.c b/src/unix/qgl.c
index 4599de98..9915651f 100644
--- a/src/unix/qgl.c
+++ b/src/unix/qgl.c
@@ -3502,11 +3502,11 @@ QGL_Init ( const char *dllname )
 			return ( false );
 		}
 
-		Com_Printf( "Using %s for OpenGL...", fn );
+		Com_Printf( "Using %s for OpenGL.\n", fn );
 	}
 	else
 	{
-		Com_Printf( "Using %s for OpenGL...", dllname );
+		Com_Printf( "Using %s for OpenGL.\n", dllname );
 	}
 
 	qglAccum                     = dllAccum = GPA( "glAccum" );
diff --git a/src/unix/system.c b/src/unix/system.c
index 4c2fa490..52135a55 100644
--- a/src/unix/system.c
+++ b/src/unix/system.c
@@ -410,7 +410,7 @@ Sys_GetGameAPI ( void *parms )
 		Com_Error( ERR_FATAL, "Sys_GetGameAPI without Sys_UnloadingGame" );
 	}
 
-	Com_Printf( "------- Loading %s -------\n", gamename );
+	Com_Printf( "LoadLibrary(\"%s\")\n", gamename );
 
 	/* now run through the search paths */
 	path = NULL;
diff --git a/src/unix/vid.c b/src/unix/vid.c
index ace8c25c..5f7ad334 100644
--- a/src/unix/vid.c
+++ b/src/unix/vid.c
@@ -232,7 +232,7 @@ VID_LoadRefresh ( char *name )
 		VID_FreeReflib();
 	}
 
-	Com_Printf( "------- Loading %s -------\n", name );
+	Com_Printf( "----- refresher initialization -----\n");
 
 	/* regain root */
 	seteuid( saved_euid );
@@ -327,7 +327,7 @@ VID_LoadRefresh ( char *name )
 	setreuid( getuid(), getuid() );
 	setegid( getgid() );
 
-	Com_Printf( "------------------------------------\n" );
+	Com_Printf( "------------------------------------\n\n" );
 	reflib_active = true;
 	return ( true );
 }