From 91f25bba0a569630c22e74d4e17ec509b3de9d17 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 25 Apr 2005 00:36:26 +0000 Subject: [PATCH] transition's finished; rename LoadEditsFromDir to LoadAllFromProfileDir to regeneralize --- stepmania/src/ProfileManager.cpp | 4 ++-- stepmania/src/SongManager.cpp | 2 +- stepmania/src/SongManager.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index 3961f70e2f..17d71d4ae8 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -188,7 +188,7 @@ bool ProfileManager::LoadProfileFromMemoryCard( PlayerNumber pn ) const CString &sSubdir = asDirsToTry[i]; CString sDir = MEM_CARD_MOUNT_POINT[pn] + sSubdir + "/"; - SONGMAN->LoadEditsFromDir( sDir, (ProfileSlot) pn ); + SONGMAN->LoadAllFromProfileDir( sDir, (ProfileSlot) pn ); } return true; // If a card is inserted, we want to use the memory card to save - even if the Profile load failed. @@ -372,7 +372,7 @@ void ProfileManager::LoadMachineProfile() // If the machine name has changed, make sure we use the new name m_MachineProfile.m_sDisplayName = PREFSMAN->m_sMachineName; - SONGMAN->LoadEditsFromDir( MACHINE_PROFILE_DIR, PROFILE_SLOT_MACHINE ); + SONGMAN->LoadAllFromProfileDir( MACHINE_PROFILE_DIR, PROFILE_SLOT_MACHINE ); } bool ProfileManager::ProfileWasLoadedFromMemoryCard( PlayerNumber pn ) const diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 05f5f099f4..e4b476f344 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1175,7 +1175,7 @@ void SongManager::UpdateRankingCourses() } } -void SongManager::LoadEditsFromDir( const CString &sDir, ProfileSlot slot ) +void SongManager::LoadAllFromProfileDir( const CString &sDir, ProfileSlot slot ) { // // Load all .edit files. diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 2f996c594c..2bc12d2d3b 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -34,7 +34,7 @@ public: void RegenerateNonFixedCourses(); void SetPreferences(); - void LoadEditsFromDir( const CString &sDir, ProfileSlot slot ); + void LoadAllFromProfileDir( const CString &sDir, ProfileSlot slot ); int GetNumStepsLoadedFromProfile(); void FreeAllLoadedFromProfile( ProfileSlot slot = PROFILE_SLOT_INVALID );