From e4fb1f2440619384dbba8195a6ed0314177284be Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 20 May 2003 04:41:47 +0000 Subject: [PATCH] rename m_bShowTranslations to m_bShowNative --- stepmania/src/PrefsManager.cpp | 6 +++--- stepmania/src/PrefsManager.h | 2 +- stepmania/src/ScreenAppearanceOptions.cpp | 4 ++-- stepmania/src/ScreenSelectCourse.cpp | 2 +- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/Song.cpp | 6 +++--- stepmania/src/song.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index fce8500e58..8c3ba8fb38 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -70,7 +70,7 @@ PrefsManager::PrefsManager() m_bInstructions = true; m_bShowDontDie = true; m_bShowSelectGroup = true; - m_bShowTranslations = true; + m_bShowNative = true; m_bArcadeOptionsNavigation = false; m_bSoloSingle = false; m_bDelayedTextureDelete = true; @@ -166,7 +166,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ) ini.GetValueB( "Options", "HowToPlay", m_bInstructions ); ini.GetValueB( "Options", "Caution", m_bShowDontDie ); ini.GetValueB( "Options", "SelectGroup", m_bShowSelectGroup ); - ini.GetValueB( "Options", "ShowTranslations", m_bShowTranslations ); + ini.GetValueB( "Options", "ShowNative", m_bShowNative ); ini.GetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.GetValue ( "Options", "DWIPath", m_DWIPath ); ini.GetValueB( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); @@ -254,7 +254,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() ini.SetValueB( "Options", "HowToPlay", m_bInstructions ); ini.SetValueB( "Options", "Caution", m_bShowDontDie ); ini.SetValueB( "Options", "SelectGroup", m_bShowSelectGroup ); - ini.SetValueB( "Options", "ShowTranslations", m_bShowTranslations ); + ini.SetValueB( "Options", "ShowNative", m_bShowNative ); ini.SetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.SetValue ( "Options", "DWIPath", m_DWIPath ); ini.SetValueB( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 0f50c80b70..c7b449367f 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -53,7 +53,7 @@ public: bool m_bAutoPlay; bool m_bDelayedEscape; bool m_bInstructions, m_bShowDontDie, m_bShowSelectGroup; - bool m_bShowTranslations; + bool m_bShowNative; bool m_bArcadeOptionsNavigation; enum { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections; int m_iMusicWheelSwitchSpeed; diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 3334641276..93fefb4798 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -139,7 +139,7 @@ void ScreenAppearanceOptions::ImportOptions() m_iSelectedOption[0][AO_DANCE_POINTS_FOR_ONI] = PREFSMAN->m_bDancePointsForOni? 1:0; m_iSelectedOption[0][AO_SELECT_GROUP] = PREFSMAN->m_bShowSelectGroup? 1:0; m_iSelectedOption[0][AO_WHEEL_SECTIONS] = (int)PREFSMAN->m_MusicWheelUsesSections; - m_iSelectedOption[0][AO_SHOW_TRANSLATIONS] = PREFSMAN->m_bShowTranslations; + m_iSelectedOption[0][AO_SHOW_TRANSLATIONS] = PREFSMAN->m_bShowNative; m_iSelectedOption[0][AO_SHOW_LYRICS] = PREFSMAN->m_bShowLyrics; } @@ -167,7 +167,7 @@ void ScreenAppearanceOptions::ExportOptions() PREFSMAN->m_bShowDontDie = !!m_iSelectedOption[0][AO_CAUTION]; PREFSMAN->m_bShowSelectGroup = !!m_iSelectedOption[0][AO_SELECT_GROUP]; (int&)PREFSMAN->m_MusicWheelUsesSections = m_iSelectedOption[0][AO_WHEEL_SECTIONS]; - PREFSMAN->m_bShowTranslations = !!m_iSelectedOption[0][AO_SHOW_TRANSLATIONS]; + PREFSMAN->m_bShowNative = !!m_iSelectedOption[0][AO_SHOW_TRANSLATIONS]; PREFSMAN->m_bShowLyrics = !!m_iSelectedOption[0][AO_SHOW_LYRICS]; PREFSMAN->m_bDancePointsForOni = !!m_iSelectedOption[0][AO_DANCE_POINTS_FOR_ONI]; diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index 64f95a16f7..8c74ba27ef 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -200,7 +200,7 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type, if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F9 ) { if( type != IET_FIRST_PRESS ) return; - PREFSMAN->m_bShowTranslations ^= 1; + PREFSMAN->m_bShowNative ^= 1; m_MusicWheel.RebuildMusicWheelItems(); Course* pCourse = m_MusicWheel.GetSelectedCourse(); if(pCourse) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index f6ee037f0d..a778a788a4 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -354,7 +354,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F9 ) { if( type != IET_FIRST_PRESS ) return; - PREFSMAN->m_bShowTranslations ^= 1; + PREFSMAN->m_bShowNative ^= 1; m_MusicWheel.RebuildMusicWheelItems(); return; } diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 1f5498531a..52c47d4133 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -1287,19 +1287,19 @@ CString Song::GetBackgroundPath() const CString Song::GetDisplayMainTitle() const { - if(!PREFSMAN->m_bShowTranslations) return GetTranslitMainTitle(); + if(!PREFSMAN->m_bShowNative) return GetTranslitMainTitle(); return m_sMainTitle; } CString Song::GetDisplaySubTitle() const { - if(!PREFSMAN->m_bShowTranslations) return GetTranslitSubTitle(); + if(!PREFSMAN->m_bShowNative) return GetTranslitSubTitle(); return m_sSubTitle; } CString Song::GetDisplayArtist() const { - if(!PREFSMAN->m_bShowTranslations) return GetTranslitArtist(); + if(!PREFSMAN->m_bShowNative) return GetTranslitArtist(); return m_sArtist; } diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 3d6f5d0869..419f3efe4e 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -113,7 +113,7 @@ public: CString m_sMainTitle, m_sSubTitle, m_sArtist; CString m_sMainTitleTranslit, m_sSubTitleTranslit, m_sArtistTranslit; - /* If PREFSMAN->m_bShowTranslations is off, these are the same as GetTranslit* below. + /* If PREFSMAN->m_bShowNative is off, these are the same as GetTranslit* below. * Otherwise, they return the main titles. */ CString GetDisplayMainTitle() const; CString GetDisplaySubTitle() const;