From 3566662436aed34582c250c58fffe5e21bff2712 Mon Sep 17 00:00:00 2001 From: "Peter S. May" Date: Fri, 12 Jul 2002 04:16:52 +0000 Subject: [PATCH] Typo "announer" was replaced with "announcer" in five places. --- stepmania/src/AnnouncerManager.cpp | 14 +++++++++++--- stepmania/src/PrefsManager.cpp | 4 ++-- stepmania/src/ScreenSelectGame.cpp | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/stepmania/src/AnnouncerManager.cpp b/stepmania/src/AnnouncerManager.cpp index b47a93259a..fecd7fb683 100644 --- a/stepmania/src/AnnouncerManager.cpp +++ b/stepmania/src/AnnouncerManager.cpp @@ -19,12 +19,14 @@ AnnouncerManager* ANNOUNCER = NULL; // global object accessable from anywhere in const CString EZ2_ANNOUNCER_NAME = "ez2"; -const CString ANNOUNER_BASE_DIR = "Announcers\\"; +const CString ANNOUNCER_BASE_DIR = "Announcers\\"; AnnouncerManager::AnnouncerManager() { + LOG->WriteLine("AnnouncerManager::AnnouncerManager()"); + CStringArray arrayAnnouncerNames; GetAnnouncerNames( arrayAnnouncerNames ); // for( int i=0; i=0; i-- ) @@ -47,6 +49,8 @@ void AnnouncerManager::GetAnnouncerNames( CStringArray& AddTo ) void AnnouncerManager::SwitchAnnouncer( CString sAnnouncerName ) { + LOG->WriteLine("AnnouncerManager::SwitchAnnouncer()"); + if( sAnnouncerName == "" ) { m_sCurAnnouncerName = ""; @@ -63,12 +67,16 @@ void AnnouncerManager::SwitchAnnouncer( CString sAnnouncerName ) // if we get here, the announcer doesn't exist sAnnouncerName = asAnnouncerNames[0]; + LOG->WriteLine("Announcer '" + sAnnouncerName + "' does not exist."); + announcer_exists: m_sCurAnnouncerName = sAnnouncerName; CString sAnnouncerDir = GetAnnouncerDirFromName( m_sCurAnnouncerName ); if( !DoesFileExist( sAnnouncerDir ) ) throw RageException( "Error loading the announcer in diretory '%s'.", m_sCurAnnouncerName ); + + LOG->WriteLine("Announcer successfully switched to '" + sAnnouncerName + "'."); } void AnnouncerManager::AssertAnnouncerIsComplete( CString sAnnouncerName ) @@ -83,7 +91,7 @@ void AnnouncerManager::AssertAnnouncerIsComplete( CString sAnnouncerName ) CString AnnouncerManager::GetAnnouncerDirFromName( CString sAnnouncerName ) { - return ANNOUNER_BASE_DIR + sAnnouncerName + "\\"; + return ANNOUNCER_BASE_DIR + sAnnouncerName + "\\"; } CString AnnouncerManager::GetPathTo( AnnouncerElement ae ) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index b79090e817..dd095289a8 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -67,7 +67,7 @@ void PrefsManager::ReadPrefsFromDisk() ini.GetValueB( "Options", "AutoPlay", m_bAutoPlay ); ini.GetValueF( "Options", "JudgeWindow", m_fJudgeWindow ); - ini.GetValue( "Options", "Announer", m_sAnnouncer ); + ini.GetValue( "Options", "Announcer", m_sAnnouncer ); ini.GetValue( "Options", "NoteSkin", m_sNoteSkin ); CString sAdditionalSongFolders; @@ -94,7 +94,7 @@ void PrefsManager::SavePrefsToDisk() ini.SetValueB( "Options", "AutoPlay", m_bAutoPlay ); ini.SetValueF( "Options", "JudgeWindow", m_fJudgeWindow ); - ini.SetValue( "Options", "Announer", m_sAnnouncer ); + ini.SetValue( "Options", "Announcer", m_sAnnouncer ); ini.SetValue( "Options", "NoteSkin", m_sNoteSkin ); ini.SetValue( "Options", "SongFolders", join(",", m_asSongFolders) ); diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp index fc3d78e2f7..ceada681ba 100644 --- a/stepmania/src/ScreenSelectGame.cpp +++ b/stepmania/src/ScreenSelectGame.cpp @@ -71,6 +71,8 @@ void ScreenSelectGame::ImportOptions() void ScreenSelectGame::ExportOptions() { + LOG->WriteLine("ScreenSelectGame::ExportOptions()"); + // Switch the current style to the frist style of the selected game Game game = (Game)m_iSelectedOption[0][SG_GAME]; switch( game )