From 8275299d7eae62783d657f77292a21986dab3503 Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 19 Jul 2012 18:37:19 +0200 Subject: [PATCH] More logging cleanup --- d3xp/Game_local.cpp | 24 ++++++------------------ d3xp/anim/Anim_Import.cpp | 3 +-- d3xp/script/Script_Program.cpp | 6 +++--- game/Game_local.cpp | 24 ++++++------------------ game/anim/Anim_Import.cpp | 3 +-- game/script/Script_Program.cpp | 6 +++--- 6 files changed, 20 insertions(+), 46 deletions(-) diff --git a/d3xp/Game_local.cpp b/d3xp/Game_local.cpp index 98f7bcb..4de1d0b 100644 --- a/d3xp/Game_local.cpp +++ b/d3xp/Game_local.cpp @@ -326,7 +326,7 @@ void idGameLocal::Init( void ) { #endif - Printf( "--------- Initializing Game ----------\n" ); + Printf( "----- Initializing Game -----\n" ); Printf( "gamename: %s\n", GAME_VERSION ); Printf( "gamedate: %s\n", __DATE__ ); @@ -406,8 +406,6 @@ void idGameLocal::Init( void ) { gamestate = GAMESTATE_NOMAP; Printf( "...%d aas types\n", aasList.Num() ); - Printf( "game initialized.\n" ); - Printf( "--------------------------------------\n" ); } /* @@ -423,7 +421,7 @@ void idGameLocal::Shutdown( void ) { return; } - Printf( "------------ Game Shutdown -----------\n" ); + Printf( "----- Game Shutdown -----\n" ); mpGame.Shutdown(); @@ -468,8 +466,6 @@ void idGameLocal::Shutdown( void ) { // shut down the animation manager animationLib.Shutdown(); - Printf( "--------------------------------------\n" ); - #ifdef GAME_DLL // remove auto-completion function pointers pointing into this DLL @@ -1060,7 +1056,7 @@ idGameLocal::LocalMapRestart void idGameLocal::LocalMapRestart( ) { int i, latchSpawnCount; - Printf( "----------- Game Map Restart ------------\n" ); + Printf( "----- Game Map Restart -----\n" ); gamestate = GAMESTATE_SHUTDOWN; @@ -1115,8 +1111,6 @@ void idGameLocal::LocalMapRestart( ) { } gamestate = GAMESTATE_ACTIVE; - - Printf( "--------------------------------------\n" ); } /* @@ -1315,7 +1309,7 @@ void idGameLocal::InitFromNewMap( const char *mapName, idRenderWorld *renderWorl MapShutdown(); } - Printf( "----------- Game Map Init ------------\n" ); + Printf( "----- Game Map Init -----\n" ); gamestate = GAMESTATE_STARTUP; @@ -1336,8 +1330,6 @@ void idGameLocal::InitFromNewMap( const char *mapName, idRenderWorld *renderWorl animationLib.FlushUnusedAnims(); gamestate = GAMESTATE_ACTIVE; - - Printf( "--------------------------------------\n" ); } /* @@ -1355,7 +1347,7 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo MapShutdown(); } - Printf( "------- Game Map Init SaveGame -------\n" ); + Printf( "----- Game Map Init SaveGame -----\n" ); gamestate = GAMESTATE_STARTUP; @@ -1589,8 +1581,6 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo gamestate = GAMESTATE_ACTIVE; - Printf( "--------------------------------------\n" ); - return true; } @@ -1640,7 +1630,7 @@ idGameLocal::MapShutdown ============ */ void idGameLocal::MapShutdown( void ) { - Printf( "--------- Game Map Shutdown ----------\n" ); + Printf( "----- Game Map Shutdown -----\n" ); gamestate = GAMESTATE_SHUTDOWN; @@ -1678,8 +1668,6 @@ void idGameLocal::MapShutdown( void ) { gameSoundWorld = NULL; gamestate = GAMESTATE_NOMAP; - - Printf( "--------------------------------------\n" ); } /* diff --git a/d3xp/anim/Anim_Import.cpp b/d3xp/anim/Anim_Import.cpp index 12ed61f..035f588 100644 --- a/d3xp/anim/Anim_Import.cpp +++ b/d3xp/anim/Anim_Import.cpp @@ -551,7 +551,7 @@ int idModelExport::ExportModels( const char *pathname, const char *extension ) { return 0; } - gameLocal.Printf( "--------- Exporting models --------\n" ); + gameLocal.Printf( "----- Exporting models -----\n" ); if ( !g_exportMask.GetString()[ 0 ] ) { gameLocal.Printf( " Export mask: '%s'\n", g_exportMask.GetString() ); } @@ -565,7 +565,6 @@ int idModelExport::ExportModels( const char *pathname, const char *extension ) { fileSystem->FreeFileList( files ); gameLocal.Printf( "...%d models exported.\n", count ); - gameLocal.Printf( "-----------------------------------\n" ); return count; } diff --git a/d3xp/script/Script_Program.cpp b/d3xp/script/Script_Program.cpp index bfcd719..716c23d 100644 --- a/d3xp/script/Script_Program.cpp +++ b/d3xp/script/Script_Program.cpp @@ -1778,7 +1778,7 @@ void idProgram::CompileStats( void ) { int funcMem; int i; - gameLocal.Printf( "---------- Compile stats ----------\n" ); + gameLocal.Printf( "----- Compile stats -----\n" ); gameLocal.DPrintf( "Files loaded:\n" ); stringspace = 0; @@ -1807,7 +1807,7 @@ void idProgram::CompileStats( void ) { memused += functions.MemoryUsed(); // name and filename of functions are shared, so no need to include them memused += sizeof( variables ); - gameLocal.Printf( "\nMemory usage:\n" ); + gameLocal.Printf( "Memory usage:\n" ); gameLocal.Printf( " Strings: %d, %d bytes\n", fileList.Num(), stringspace ); gameLocal.Printf( " Statements: %d, %zd bytes\n", statements.Num(), statements.MemoryUsed() ); gameLocal.Printf( " Functions: %d, %d bytes\n", functions.Num(), funcMem ); @@ -1815,7 +1815,7 @@ void idProgram::CompileStats( void ) { gameLocal.Printf( " Mem used: %d bytes\n", memused ); gameLocal.Printf( " Static data: %zd bytes\n", sizeof( idProgram ) ); gameLocal.Printf( " Allocated: %d bytes\n", memallocated ); - gameLocal.Printf( " Thread size: %zd bytes\n\n", sizeof( idThread ) ); + gameLocal.Printf( " Thread size: %zd bytes\n", sizeof( idThread ) ); } /* diff --git a/game/Game_local.cpp b/game/Game_local.cpp index 665f16f..892efce 100644 --- a/game/Game_local.cpp +++ b/game/Game_local.cpp @@ -282,7 +282,7 @@ void idGameLocal::Init( void ) { #endif - Printf( "--------- Initializing Game ----------\n" ); + Printf( "----- Initializing Game -----\n" ); Printf( "gamename: %s\n", GAME_VERSION ); Printf( "gamedate: %s\n", __DATE__ ); @@ -330,8 +330,6 @@ void idGameLocal::Init( void ) { gamestate = GAMESTATE_NOMAP; Printf( "...%d aas types\n", aasList.Num() ); - Printf( "game initialized.\n" ); - Printf( "--------------------------------------\n" ); } /* @@ -347,7 +345,7 @@ void idGameLocal::Shutdown( void ) { return; } - Printf( "------------ Game Shutdown -----------\n" ); + Printf( "----- Game Shutdown -----\n" ); mpGame.Shutdown(); @@ -392,8 +390,6 @@ void idGameLocal::Shutdown( void ) { // shut down the animation manager animationLib.Shutdown(); - Printf( "--------------------------------------\n" ); - #ifdef GAME_DLL // remove auto-completion function pointers pointing into this DLL @@ -955,7 +951,7 @@ idGameLocal::LocalMapRestart void idGameLocal::LocalMapRestart( ) { int i, latchSpawnCount; - Printf( "----------- Game Map Restart ------------\n" ); + Printf( "----- Game Map Restart -----\n" ); gamestate = GAMESTATE_SHUTDOWN; @@ -1003,8 +999,6 @@ void idGameLocal::LocalMapRestart( ) { } gamestate = GAMESTATE_ACTIVE; - - Printf( "--------------------------------------\n" ); } /* @@ -1177,7 +1171,7 @@ void idGameLocal::InitFromNewMap( const char *mapName, idRenderWorld *renderWorl MapShutdown(); } - Printf( "----------- Game Map Init ------------\n" ); + Printf( "----- Game Map Init -----\n" ); gamestate = GAMESTATE_STARTUP; @@ -1198,8 +1192,6 @@ void idGameLocal::InitFromNewMap( const char *mapName, idRenderWorld *renderWorl animationLib.FlushUnusedAnims(); gamestate = GAMESTATE_ACTIVE; - - Printf( "--------------------------------------\n" ); } /* @@ -1217,7 +1209,7 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo MapShutdown(); } - Printf( "------- Game Map Init SaveGame -------\n" ); + Printf( "----- Game Map Init SaveGame -----\n" ); gamestate = GAMESTATE_STARTUP; @@ -1418,8 +1410,6 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo gamestate = GAMESTATE_ACTIVE; - Printf( "--------------------------------------\n" ); - return true; } @@ -1469,7 +1459,7 @@ idGameLocal::MapShutdown ============ */ void idGameLocal::MapShutdown( void ) { - Printf( "--------- Game Map Shutdown ----------\n" ); + Printf( "----- Game Map Shutdown -----\n" ); gamestate = GAMESTATE_SHUTDOWN; @@ -1507,8 +1497,6 @@ void idGameLocal::MapShutdown( void ) { gameSoundWorld = NULL; gamestate = GAMESTATE_NOMAP; - - Printf( "--------------------------------------\n" ); } /* diff --git a/game/anim/Anim_Import.cpp b/game/anim/Anim_Import.cpp index cbc89c5..c939723 100644 --- a/game/anim/Anim_Import.cpp +++ b/game/anim/Anim_Import.cpp @@ -545,7 +545,7 @@ int idModelExport::ExportModels( const char *pathname, const char *extension ) { return 0; } - gameLocal.Printf( "--------- Exporting models --------\n" ); + gameLocal.Printf( "----- Exporting models -----\n" ); if ( !g_exportMask.GetString()[ 0 ] ) { gameLocal.Printf( " Export mask: '%s'\n", g_exportMask.GetString() ); } @@ -559,7 +559,6 @@ int idModelExport::ExportModels( const char *pathname, const char *extension ) { fileSystem->FreeFileList( files ); gameLocal.Printf( "...%d models exported.\n", count ); - gameLocal.Printf( "-----------------------------------\n" ); return count; } diff --git a/game/script/Script_Program.cpp b/game/script/Script_Program.cpp index bfcd719..716c23d 100644 --- a/game/script/Script_Program.cpp +++ b/game/script/Script_Program.cpp @@ -1778,7 +1778,7 @@ void idProgram::CompileStats( void ) { int funcMem; int i; - gameLocal.Printf( "---------- Compile stats ----------\n" ); + gameLocal.Printf( "----- Compile stats -----\n" ); gameLocal.DPrintf( "Files loaded:\n" ); stringspace = 0; @@ -1807,7 +1807,7 @@ void idProgram::CompileStats( void ) { memused += functions.MemoryUsed(); // name and filename of functions are shared, so no need to include them memused += sizeof( variables ); - gameLocal.Printf( "\nMemory usage:\n" ); + gameLocal.Printf( "Memory usage:\n" ); gameLocal.Printf( " Strings: %d, %d bytes\n", fileList.Num(), stringspace ); gameLocal.Printf( " Statements: %d, %zd bytes\n", statements.Num(), statements.MemoryUsed() ); gameLocal.Printf( " Functions: %d, %d bytes\n", functions.Num(), funcMem ); @@ -1815,7 +1815,7 @@ void idProgram::CompileStats( void ) { gameLocal.Printf( " Mem used: %d bytes\n", memused ); gameLocal.Printf( " Static data: %zd bytes\n", sizeof( idProgram ) ); gameLocal.Printf( " Allocated: %d bytes\n", memallocated ); - gameLocal.Printf( " Thread size: %zd bytes\n\n", sizeof( idThread ) ); + gameLocal.Printf( " Thread size: %zd bytes\n", sizeof( idThread ) ); } /*