From e54454ed2291fbb45e294fe5f542bbeae262a85a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 12 Feb 2003 20:28:28 +0000 Subject: [PATCH] add m_bUseAlternateText --- stepmania/src/BitmapText.cpp | 7 ++++--- stepmania/src/PrefsManager.cpp | 3 +++ stepmania/src/PrefsManager.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 05421e74b4..a44dd0e316 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -219,14 +219,13 @@ void BitmapText::DrawChars() } } -/* sText is UTF-8. If PREFSMAN->UseAlternateText is enabled, and not all +/* 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 - * in sAlternateText, too, just use sText. - * XXX: implement PREFSMAN->UseAlternateText */ + * in sAlternateText, too, just use sText. */ void BitmapText::SetText( CString sText, CString sAlternateText ) { ASSERT( m_pFont ); @@ -250,6 +249,8 @@ 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 df3c930f2c..db89bfeb63 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -69,6 +69,7 @@ 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; @@ -146,6 +147,7 @@ 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 ); @@ -219,6 +221,7 @@ 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 dc95055c7e..88413ab71e 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -53,6 +53,7 @@ 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;