From 96bcbbc8203014a9417e1fe29b9deea3d691ade8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 25 Apr 2005 00:09:59 +0000 Subject: [PATCH] allow freeing steps from a specific profile --- stepmania/src/GameState.cpp | 4 ++-- stepmania/src/SongManager.cpp | 4 ++-- stepmania/src/SongManager.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 625d8959e3..598a54802d 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -185,7 +185,7 @@ void GameState::Reset() FOREACH_PlayerNumber( pn ) PROFILEMAN->UnloadProfile( pn ); - SONGMAN->FreeAllLoadedFromProfiles(); + SONGMAN->FreeAllLoadedFromProfile(); SONGMAN->UpdateBest(); SONGMAN->UpdateShuffled(); @@ -385,7 +385,7 @@ void GameState::EndGame() // MEMCARDMAN->FlushAndReset(); CHECKPOINT; - SONGMAN->FreeAllLoadedFromProfiles(); + SONGMAN->FreeAllLoadedFromProfile(); // make sure we don't execute EndGame twice. m_timeGameStarted.SetZero(); diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 27fc4d1214..08ebe26220 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1214,12 +1214,12 @@ void SongManager::LoadEditsFromDir( const CString &sDir, ProfileSlot slot ) } } -void SongManager::FreeAllLoadedFromProfiles() +void SongManager::FreeAllLoadedFromProfile( ProfileSlot slot ) { for( unsigned s=0; sFreeAllLoadedFromProfile(); + pSong->FreeAllLoadedFromProfile( slot ); } // After freeing some Steps pointers, the cache will be invalid. diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index ad8b3744fb..dbb090562f 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -37,7 +37,7 @@ public: void LoadAllFromProfile( ProfileSlot s ); // songs, edits void LoadEditsFromDir( const CString &sDir, ProfileSlot slot ); int GetNumStepsLoadedFromProfile(); - void FreeAllLoadedFromProfiles(); + void FreeAllLoadedFromProfile( ProfileSlot slot = PROFILE_SLOT_INVALID ); void LoadGroupSymLinks( CString sDir, CString sGroupFolder );