Typo "announer" was replaced with "announcer" in five places.

This commit is contained in:
Peter S. May
2002-07-12 04:16:52 +00:00
parent ea65052280
commit 3566662436
3 changed files with 15 additions and 5 deletions
+11 -3
View File
@@ -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<arrayAnnouncerNames.GetSize(); i++ )
@@ -35,7 +37,7 @@ AnnouncerManager::AnnouncerManager()
void AnnouncerManager::GetAnnouncerNames( CStringArray& AddTo )
{
GetDirListing( ANNOUNER_BASE_DIR+"*", AddTo, true );
GetDirListing( ANNOUNCER_BASE_DIR+"*", AddTo, true );
// strip out the folder called "CVS"
for( int i=AddTo.GetSize()-1; 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 )
+2 -2
View File
@@ -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) );
+2
View File
@@ -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 )