From f916b8a83fbda118120b8496b2445791eb384bae Mon Sep 17 00:00:00 2001 From: Mark Cannon Date: Mon, 3 Nov 2008 23:26:09 +0000 Subject: [PATCH] Updated makefiles, added debug symbols to SCREENMAN to check out some memory leaks git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@536 83fadc84-e282-4d84-a09a-c4228d6ae7e5 --- ToDo.txt | 2 +- src/Makefile.am | 5 +++-- src/ScreenManager.cpp | 5 +++++ src/StepMania-net2003.vcproj | 18 ++++++++++++------ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ToDo.txt b/ToDo.txt index 24f83b4a..653e144b 100644 --- a/ToDo.txt +++ b/ToDo.txt @@ -1,7 +1,7 @@ /* More-or-less in order of priority. */ /* Major bug fixing */ --Switching modes on the main menu causes OpenITG to hang +-Switching modes on the main menu causes OpenITG to hang (out-of-memory error) -Figure out what the hell's up with saving USB stats /* Minor bug fixing */ diff --git a/src/Makefile.am b/src/Makefile.am index daa278fc..a3958edb 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,7 +299,9 @@ RageFileDriverTimeout.cpp RageFileDriverTimeout.h \ RageFileDriverCrypt.cpp RageFileDriverCrypt.h RageFileDriverPatch.cpp RageFileDriverPatch.h Rage = $(PCRE) $(RageFile) $(RageSoundFileReaders) \ -RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \ +RageBitmapTexture.cpp RageBitmapTexture.h RageCryptInterface.cpp RageCryptInterface.h \ +RageCryptInterface_ITG2.cpp RageCryptInterface_ITG2.h \ +RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \ RageDisplay_OGL_Extensions.cpp RageDisplay_OGL_Extensions.h \ RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \ RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \ @@ -373,7 +375,6 @@ crypto/CryptRand.cpp crypto/CryptRand.h crypto/CryptSH512.cpp crypto/CryptSH512. crypto/CryptSHA.cpp crypto/CryptSHA.h cryptopp = \ -ITG2CryptInterface.cpp ITG2CryptInterface.h \ crypto51/algebra.cpp crypto51/algebra.h crypto51/algparam.cpp crypto51/algparam.h crypto51/argnames.h \ crypto51/asn.cpp crypto51/asn.h crypto51/config.h crypto51/cryptlib.cpp crypto51/cryptlib.h crypto51/files.cpp \ crypto51/files.h crypto51/filters.cpp crypto51/filters.h crypto51/fltrimpl.h crypto51/integer.cpp crypto51/integer.h \ diff --git a/src/ScreenManager.cpp b/src/ScreenManager.cpp index 71a61175..a9c0f3dc 100755 --- a/src/ScreenManager.cpp +++ b/src/ScreenManager.cpp @@ -267,6 +267,7 @@ void ScreenManager::Input( const DeviceInput& DeviceI, const InputEventType type /* Just create a new screen; don't do any associated cleanup. */ Screen* ScreenManager::MakeNewScreenInternal( const CString &sScreenName ) { + LOG->Debug( "ScreenManager::MakeNewScreenInternal( %s )", sScreenName.c_str() ); RageTimer t; LOG->Trace( "Loading screen name '%s'", sScreenName.c_str() ); @@ -287,6 +288,7 @@ Screen* ScreenManager::MakeNewScreenInternal( const CString &sScreenName ) Screen* ScreenManager::MakeNewScreen( const CString &sScreenName ) { + LOG->Debug( "ScreenManager::MakeNewScreen( %s )", sScreenName.c_str() ); m_bZeroNextUpdate = true; /* By default, RageSounds handles the song timer. When we change screens, reset this; @@ -356,6 +358,8 @@ void ScreenManager::ClearScreenStack() * current screens are removed. This is the only function that adds to m_ScreenStack. */ void ScreenManager::SetFromNewScreen( Screen *pNewScreen, bool Stack ) { + LOG->Debug( "ScreenManager::SetFromNewScreen()" ); + if( !Stack ) ClearScreenStack(); @@ -368,6 +372,7 @@ void ScreenManager::SetFromNewScreen( Screen *pNewScreen, bool Stack ) void ScreenManager::SetNewScreen( const CString &sScreenName ) { + LOG->Debug( "ScreenManager::SetNewScreen( %s )", sScreenName.c_str() ); ASSERT( sScreenName != "" ); m_sDelayedScreen = sScreenName; diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj index b5ad0171..9d742aa1 100755 --- a/src/StepMania-net2003.vcproj +++ b/src/StepMania-net2003.vcproj @@ -2326,6 +2326,18 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ RelativePath=".\RageBitmapTexture.h"> + + + + + + + + - - - -