From 2b9d990e712c5f92de6d5d08da0630000a1d6f5e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 4 Dec 2004 06:09:30 +0000 Subject: [PATCH] prefs name cleanup --- stepmania/src/Course.cpp | 4 ++-- stepmania/src/PrefsManager.cpp | 24 +++++++++++----------- stepmania/src/PrefsManager.h | 6 +++--- stepmania/src/Screen.cpp | 2 +- stepmania/src/ScreenCaution.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 6 +++--- stepmania/src/ScreenInstructions.cpp | 2 +- stepmania/src/ScreenOptionsMasterPrefs.cpp | 8 ++++---- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/Song.cpp | 6 +++--- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 8b56974ec4..22b0c7a861 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -549,14 +549,14 @@ struct SortTrailEntry CString Course::GetDisplayMainTitle() const { - if( !PREFSMAN->m_bShowNative ) + if( !PREFSMAN->m_bShowNativeLanguage ) return GetTranslitMainTitle(); return m_sMainTitle; } CString Course::GetDisplaySubTitle() const { - if( !PREFSMAN->m_bShowNative ) + if( !PREFSMAN->m_bShowNativeLanguage ) return GetTranslitSubTitle(); return m_sSubTitle; } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index cd0a2a6570..33f1f4e084 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -167,11 +167,11 @@ void PrefsManager::Init() m_fSuperMeterPercentChangeNG = -0.20f; m_bMercifulSuperMeter = true; - m_bDelayedEscape = true; - m_bInstructions = true; - m_bShowDontDie = true; + m_bDelayedBack = true; + m_bShowInstructions = true; + m_bShowCaution = true; m_bShowSelectGroup = true; - m_bShowNative = true; + m_bShowNativeLanguage = true; m_bArcadeOptionsNavigation = false; m_bSoloSingle = false; m_bDelayedTextureDelete = true; @@ -464,13 +464,13 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) ini.GetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG ); ini.GetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter ); - ini.GetValue( "Options", "DelayedEscape", m_bDelayedEscape ); + ini.GetValue( "Options", "DelayedEscape", m_bDelayedBack ); ini.GetValue( "Options", "HiddenSongs", m_bHiddenSongs ); ini.GetValue( "Options", "Vsync", m_bVsync ); - ini.GetValue( "Options", "HowToPlay", m_bInstructions ); - ini.GetValue( "Options", "Caution", m_bShowDontDie ); + ini.GetValue( "Options", "ShowInstructions", m_bShowInstructions ); + ini.GetValue( "Options", "ShowCaution", m_bShowCaution ); ini.GetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); - ini.GetValue( "Options", "ShowNative", m_bShowNative ); + ini.GetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage ); ini.GetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.GetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); ini.GetValue( "Options", "TexturePreload", m_bTexturePreload ); @@ -721,15 +721,15 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG ); ini.SetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter ); - ini.SetValue( "Options", "DelayedEscape", m_bDelayedEscape ); + ini.SetValue( "Options", "DelayedEscape", m_bDelayedBack ); ini.SetValue( "Options", "HiddenSongs", m_bHiddenSongs ); ini.SetValue( "Options", "Vsync", m_bVsync ); ini.SetValue( "Options", "Interlaced", m_bInterlaced ); ini.SetValue( "Options", "PAL", m_bPAL ); - ini.SetValue( "Options", "HowToPlay", m_bInstructions ); - ini.SetValue( "Options", "Caution", m_bShowDontDie ); + ini.SetValue( "Options", "ShowInstructions", m_bShowInstructions ); + ini.SetValue( "Options", "ShowCaution", m_bShowCaution ); ini.SetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); - ini.SetValue( "Options", "ShowNative", m_bShowNative ); + ini.SetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage ); ini.SetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.SetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); ini.SetValue( "Options", "TexturePreload", m_bTexturePreload ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 891a88c833..329d521a7e 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -128,9 +128,9 @@ public: bool m_bMercifulSuperMeter; // negative super deltas are scaled by the players life percentage bool m_bAutoPlay; - bool m_bDelayedEscape; - bool m_bInstructions, m_bShowDontDie, m_bShowSelectGroup; - bool m_bShowNative; + bool m_bDelayedBack; + bool m_bShowInstructions, m_bShowCaution, m_bShowSelectGroup; + bool m_bShowNativeLanguage; bool m_bArcadeOptionsNavigation; enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections; int m_iMusicWheelSwitchSpeed; diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 088978d644..c1dc7b35f7 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -101,7 +101,7 @@ void Screen::Update( float fDeltaTime ) void Screen::MenuBack( PlayerNumber pn, const InputEventType type ) { - if(!PREFSMAN->m_bDelayedEscape || type==IET_SLOW_REPEAT || type==IET_FAST_REPEAT) + if(!PREFSMAN->m_bDelayedBack || type==IET_SLOW_REPEAT || type==IET_FAST_REPEAT) MenuBack(pn); } diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 8dcc2a8a92..dd1e41af68 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/stepmania/src/ScreenCaution.cpp @@ -17,7 +17,7 @@ const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8); REGISTER_SCREEN_CLASS( ScreenCaution ); ScreenCaution::ScreenCaution( CString sName ) : Screen( sName ) { - if(!PREFSMAN->m_bShowDontDie) + if(!PREFSMAN->m_bShowCaution) { this->PostScreenMessage( SM_GoToNextScreen, 0.f ); return; diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 541a4779e0..a19de70055 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1703,7 +1703,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ } if( MenuI.button == MENU_BUTTON_BACK && - ((!PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) || + ((!PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS) || (DeviceI.device==DEVICE_KEYBOARD && (type==IET_SLOW_REPEAT||type==IET_FAST_REPEAT)) || (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT)) ) { @@ -1732,7 +1732,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ return; } - if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) + if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS) { m_textDebug.SetText( "Continue holding BACK to quit" ); m_textDebug.StopTweening(); @@ -1742,7 +1742,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ return; } - if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_RELEASE ) + if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedBack && type==IET_RELEASE ) { m_textDebug.StopTweening(); m_textDebug.BeginTweening( 1/8.f ); diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index 2a6de92fe7..4ee051c7fe 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -19,7 +19,7 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements // // Skip this screen unless someone chose easy or beginner // - if( !PREFSMAN->m_bInstructions ) + if( !PREFSMAN->m_bShowInstructions ) { HandleScreenMessage( SM_GoToNextScreen ); return; diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 72fa30420c..dc0f55c1e5 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -199,14 +199,14 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const CStringArray &choices ) } /* Appearance options */ -MOVE( Instructions, PREFSMAN->m_bInstructions ); -MOVE( Caution, PREFSMAN->m_bShowDontDie ); +MOVE( Instructions, PREFSMAN->m_bShowInstructions ); +MOVE( Caution, PREFSMAN->m_bShowCaution ); MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni ); MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup ); MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections ); MOVE( CourseSort, PREFSMAN->m_iCourseSortOrder ); MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd ); -MOVE( Translations, PREFSMAN->m_bShowNative ); +MOVE( Translations, PREFSMAN->m_bShowNativeLanguage ); MOVE( Lyrics, PREFSMAN->m_bShowLyrics ); /* Misc. options */ @@ -236,7 +236,7 @@ static void NumBackgrounds( int &sel, bool ToSel, const CStringArray &choices ) MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange ); MOVE( MenuButtons, PREFSMAN->m_bOnlyDedicatedMenuButtons ); MOVE( AutoPlay, PREFSMAN->m_bAutoPlay ); -MOVE( BackDelayed, PREFSMAN->m_bDelayedEscape ); +MOVE( BackDelayed, PREFSMAN->m_bDelayedBack ); MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation ); static void WheelSpeed( int &sel, bool ToSel, const CStringArray &choices ) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 48ca6bc4df..98c2f4f2d5 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -735,7 +735,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F9 ) { if( type != IET_FIRST_PRESS ) return; - PREFSMAN->m_bShowNative ^= 1; + PREFSMAN->m_bShowNativeLanguage ^= 1; m_MusicWheel.RebuildMusicWheelItems(); m_CourseContentsFrame.SetFromGameState(); return; diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index c89ad43ff0..886bae1895 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -1257,19 +1257,19 @@ CString Song::GetBackgroundPath() const CString Song::GetDisplayMainTitle() const { - if(!PREFSMAN->m_bShowNative) return GetTranslitMainTitle(); + if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitMainTitle(); return m_sMainTitle; } CString Song::GetDisplaySubTitle() const { - if(!PREFSMAN->m_bShowNative) return GetTranslitSubTitle(); + if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitSubTitle(); return m_sSubTitle; } CString Song::GetDisplayArtist() const { - if(!PREFSMAN->m_bShowNative) return GetTranslitArtist(); + if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitArtist(); return m_sArtist; }