diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index d07e9530ac..fb8a706851 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -219,12 +219,8 @@ void BitmapText::DrawChars() } } -/* sText is UTF-8. If PREFSMAN->m_bUseAlternateText is enabled, and not all - * of the characters in sText are available in the font, sAlternateText - * will be used instead. This is normally enabled; the option exists - * as a troubleshooting option (so should only be shown in a debug options - * menu) for the case that a string isn't being displayed, to find out - * which character is causing problems. If there are unavailable characters +/* sText is UTF-8. If not all of the characters in sText are available in the + * font, sAlternateText will be used instead. If there are unavailable characters * in sAlternateText, too, just use sText. */ void BitmapText::SetText( CString sText, CString sAlternateText ) { @@ -249,8 +245,6 @@ bool BitmapText::StringWillUseAlternate(CString sText, CString sAlternateText) c { ASSERT( m_pFont ); - if(!PREFSMAN->m_bUseAlternateText) return false; - /* Can't use the alternate if there isn't one. */ if(!sAlternateText.size()) return false; diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index a0f8fa1705..03e33f024e 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -69,7 +69,6 @@ PrefsManager::PrefsManager() m_bShowDontDie = true; m_bShowSelectGroup = true; m_bShowTranslations = true; - m_bUseAlternateText = true; m_bArcadeOptionsNavigation = false; m_iUnloadTextureDelaySeconds = 0; // disabled 60*30; // 30 mins m_bCoinOpMode = false; @@ -149,7 +148,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ) ini.GetValueB( "Options", "Caution", m_bShowDontDie ); ini.GetValueB( "Options", "SelectGroup", m_bShowSelectGroup ); ini.GetValueB( "Options", "ShowTranslations", m_bShowTranslations ); - ini.GetValueB( "Options", "UseAlternateText", m_bUseAlternateText ); ini.GetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.GetValue ( "Options", "DWIPath", m_DWIPath ); ini.GetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds ); @@ -225,7 +223,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() ini.SetValueB( "Options", "Caution", m_bShowDontDie ); ini.SetValueB( "Options", "SelectGroup", m_bShowSelectGroup ); ini.SetValueB( "Options", "ShowTranslations", m_bShowTranslations ); - ini.SetValueB( "Options", "UseAlternateText", m_bUseAlternateText ); ini.SetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.SetValue ( "Options", "DWIPath", m_DWIPath ); ini.SetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 9e025f972a..2c378b7a86 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -53,7 +53,6 @@ public: bool m_bDelayedEscape; bool m_bInstructions, m_bShowDontDie, m_bShowSelectGroup; bool m_bShowTranslations; - bool m_bUseAlternateText; bool m_bArcadeOptionsNavigation; bool m_bCoinOpMode; enum { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections;