mirror of
https://github.com/dhewm/dhewm3.git
synced 2025-03-21 02:01:03 +00:00
More logging cleanup
This commit is contained in:
parent
373fccbd59
commit
2a3d07e174
14 changed files with 27 additions and 71 deletions
|
@ -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" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 ) );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -514,7 +514,7 @@ void idCommonLocal::PrintWarnings( void ) {
|
|||
|
||||
warningList.Sort();
|
||||
|
||||
Printf( "------------- Warnings ---------------\n" );
|
||||
Printf( "----- Warnings -----\n" );
|
||||
Printf( "during %s...\n", warningCaption.c_str() );
|
||||
|
||||
for ( i = 0; i < warningList.Num(); i++ ) {
|
||||
|
@ -555,7 +555,7 @@ void idCommonLocal::DumpWarnings( void ) {
|
|||
warningFile = fileSystem->OpenFileWrite( "warnings.txt", "fs_savepath" );
|
||||
if ( warningFile ) {
|
||||
|
||||
warningFile->Printf( "------------- Warnings ---------------\n\n" );
|
||||
warningFile->Printf( "----- Warnings -----\n\n" );
|
||||
warningFile->Printf( "during %s...\n", warningCaption.c_str() );
|
||||
warningList.Sort();
|
||||
for ( i = 0; i < warningList.Num(); i++ ) {
|
||||
|
@ -568,7 +568,7 @@ void idCommonLocal::DumpWarnings( void ) {
|
|||
warningFile->Printf( "\n%d warnings.\n", warningList.Num() );
|
||||
}
|
||||
|
||||
warningFile->Printf( "\n\n-------------- Errors ---------------\n\n" );
|
||||
warningFile->Printf( "\n\n----- Errors -----\n\n" );
|
||||
errorList.Sort();
|
||||
for ( i = 0; i < errorList.Num(); i++ ) {
|
||||
errorList[i].RemoveColors();
|
||||
|
@ -2825,8 +2825,6 @@ void idCommonLocal::Init( int argc, char **argv ) {
|
|||
session->StartMenu( true );
|
||||
}
|
||||
|
||||
Printf( "--- Common Initialization Complete ---\n" );
|
||||
|
||||
// print all warnings queued during initialization
|
||||
PrintWarnings();
|
||||
|
||||
|
|
|
@ -875,8 +875,6 @@ void idDeclManagerLocal::Init( void ) {
|
|||
cmdSystem->AddCommand( "printAudio", idPrintDecls_f<DECL_AUDIO>, CMD_FL_SYSTEM, "prints an Video", idCmdSystem::ArgCompletion_Decl<DECL_AUDIO> );
|
||||
|
||||
cmdSystem->AddCommand( "listHuffmanFrequencies", ListHuffmanFrequencies_f, CMD_FL_SYSTEM, "lists decl text character frequencies" );
|
||||
|
||||
common->Printf( "------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -2197,7 +2197,7 @@ void idFileSystemLocal::Startup( void ) {
|
|||
pack_t *pak;
|
||||
int addon_index;
|
||||
|
||||
common->Printf( "------ Initializing File System ------\n" );
|
||||
common->Printf( "----- Initializing File System -----\n" );
|
||||
|
||||
if ( restartChecksums.Num() ) {
|
||||
common->Printf( "restarting in pure mode with %d pak files\n", restartChecksums.Num() );
|
||||
|
@ -2357,9 +2357,6 @@ void idFileSystemLocal::Startup( void ) {
|
|||
|
||||
// print the current search paths
|
||||
Path_f( idCmdArgs() );
|
||||
|
||||
common->Printf( "file system initialized.\n" );
|
||||
common->Printf( "--------------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1603,7 +1603,7 @@ void idSessionLocal::ExecuteMapChange( bool noFadeWipe ) {
|
|||
|
||||
int start = Sys_Milliseconds();
|
||||
|
||||
common->Printf( "--------- Map Initialization ---------\n" );
|
||||
common->Printf( "----- Map Initialization -----\n" );
|
||||
common->Printf( "Map: %s\n", mapString.c_str() );
|
||||
|
||||
// let the renderSystem load all the geometry
|
||||
|
@ -1661,8 +1661,6 @@ void idSessionLocal::ExecuteMapChange( bool noFadeWipe ) {
|
|||
}
|
||||
}
|
||||
|
||||
common->Printf ("-----------------------------------\n");
|
||||
|
||||
int msec = Sys_Milliseconds() - start;
|
||||
common->Printf( "%6d msec to load %s\n", msec, mapString.c_str() );
|
||||
|
||||
|
@ -2824,7 +2822,7 @@ so commands, cvars, files, etc are all available
|
|||
*/
|
||||
void idSessionLocal::Init() {
|
||||
|
||||
common->Printf( "-------- Initializing Session --------\n" );
|
||||
common->Printf( "----- Initializing Session -----\n" );
|
||||
|
||||
cmdSystem->AddCommand( "writePrecache", Sess_WritePrecache_f, CMD_FL_SYSTEM|CMD_FL_CHEAT, "writes precache commands" );
|
||||
|
||||
|
@ -2896,9 +2894,6 @@ void idSessionLocal::Init() {
|
|||
guiHandle = NULL;
|
||||
|
||||
ReadCDKey();
|
||||
|
||||
common->Printf( "session initialized\n" );
|
||||
common->Printf( "--------------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 ) );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -2099,7 +2099,6 @@ void idImageManager::EndLevelLoad() {
|
|||
common->Printf( "%5i kept from previous\n", keepCount );
|
||||
common->Printf( "%5i new loaded\n", loadCount );
|
||||
common->Printf( "all images loaded in %5.1f seconds\n", (end-start) * 0.001 );
|
||||
common->Printf( "----------------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -567,7 +567,6 @@ void idRenderModelManagerLocal::EndLevelLoad() {
|
|||
if ( loadCount ) {
|
||||
common->Printf( "%5i new models loaded in %5.1f seconds\n", loadCount, (end-start) * 0.001 );
|
||||
}
|
||||
common->Printf( "---------------------------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -496,7 +496,6 @@ void R_ReloadARBPrograms_f( const idCmdArgs &args ) {
|
|||
for ( i = 0 ; progs[i].name[0] ; i++ ) {
|
||||
R_LoadARBProgram( i );
|
||||
}
|
||||
common->Printf( "-------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -508,7 +507,7 @@ R_ARB2_Init
|
|||
void R_ARB2_Init( void ) {
|
||||
glConfig.allowARB2Path = false;
|
||||
|
||||
common->Printf( "---------- R_ARB2_Init ----------\n" );
|
||||
common->Printf( "ARB2 renderer: " );
|
||||
|
||||
if ( !glConfig.ARBVertexProgramAvailable || !glConfig.ARBFragmentProgramAvailable ) {
|
||||
common->Printf( "Not available.\n" );
|
||||
|
@ -517,7 +516,5 @@ void R_ARB2_Init( void ) {
|
|||
|
||||
common->Printf( "Available.\n" );
|
||||
|
||||
common->Printf( "---------------------------------\n" );
|
||||
|
||||
glConfig.allowARB2Path = true;
|
||||
}
|
||||
|
|
|
@ -211,7 +211,6 @@ void idSoundCache::EndLevelLoad() {
|
|||
|
||||
common->Printf( "%5ik referenced\n", useCount / 1024 );
|
||||
common->Printf( "%5ik purged\n", purgeCount / 1024 );
|
||||
common->Printf( "----------------------------------------\n" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue