real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

add another checkpoint for timing; remove GetSingletonPtr (now uses the singleton's #define)

Browse Source 
This was SVN commit r483.
This commit is contained in:
janwas 2004-06-11 18:02:57 +00:00
parent c5bd66b528
commit b5f4478bcb
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/main.cpp
View File

@ -609,6 +609,16 @@ PREVTSC=TSC;
vfs_mount("", "mods/official/", 0); vfs_mount("", "mods/official/", 0);
#ifdef _MSC_VER
u64 CURTSC=rdtsc();
debug_out(
"----------------------------------------\n"\
"VFS ready (elapsed = %f ms)\n"\
"----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3);
PREVTSC=CURTSC;
#endif
#ifndef NO_GUI #ifndef NO_GUI
// GUI uses VFS, so this must come after VFS init. // GUI uses VFS, so this must come after VFS init.
g_GUI.Initialize(); g_GUI.Initialize();
@ -712,12 +722,14 @@ if(!g_MapFile)
g_Console->RegisterFunc(Testing, "Testing"); g_Console->RegisterFunc(Testing, "Testing");
#ifdef _MSC_VER #ifdef _MSC_VER
{
u64 CURTSC=rdtsc(); u64 CURTSC=rdtsc();
debug_out( debug_out(
"----------------------------------------\n"\ "----------------------------------------\n"\
"READY (elapsed = %f ms)\n"\ "READY (elapsed = %f ms)\n"\
"----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3); "----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3);
PREVTSC=CURTSC; PREVTSC=CURTSC;
}
#endif #endif
@ -771,7 +783,7 @@ PREVTSC=CURTSC;
#ifndef NO_GUI #ifndef NO_GUI
g_GUI.Destroy(); g_GUI.Destroy();
delete CGUI::GetSingletonPtr(); delete &g_GUI;
#endif #endif
delete g_Console; delete g_Console;
@ -781,15 +793,15 @@ PREVTSC=CURTSC;
delete &g_EntityTemplateCollection; delete &g_EntityTemplateCollection;
// destroy actor related stuff // destroy actor related stuff
delete CUnitManager::GetSingletonPtr(); delete &g_UnitMan;
delete CObjectManager::GetSingletonPtr(); delete &g_ObjMan;
delete CSkeletonAnimManager::GetSingletonPtr(); delete &g_SkelAnimMan;
// destroy terrain related stuff // destroy terrain related stuff
delete CTextureManager::GetSingletonPtr(); delete &g_TexMan;
// destroy renderer // destroy renderer
delete CRenderer::GetSingletonPtr(); delete &g_Renderer;
// close down Xerces // close down Xerces
XMLPlatformUtils::Terminate(); XMLPlatformUtils::Terminate();