actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

prefs name cleanup

Browse Source
This commit is contained in:
Chris Danford
2004-12-04 06:09:30 +00:00
parent 783e492b0b
commit 2b9d990e71
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+2 -2
View File
@@ -549,14 +549,14 @@ struct SortTrailEntry
CString Course::GetDisplayMainTitle() const CString Course::GetDisplayMainTitle() const
{ {
if( !PREFSMAN->m_bShowNative ) if( !PREFSMAN->m_bShowNativeLanguage )
return GetTranslitMainTitle(); return GetTranslitMainTitle();
return m_sMainTitle; return m_sMainTitle;
} }
CString Course::GetDisplaySubTitle() const CString Course::GetDisplaySubTitle() const
{ {
if( !PREFSMAN->m_bShowNative ) if( !PREFSMAN->m_bShowNativeLanguage )
return GetTranslitSubTitle(); return GetTranslitSubTitle();
return m_sSubTitle; return m_sSubTitle;
} }
stepmania/src/PrefsManager.cpp
+12 -12
View File
@@ -167,11 +167,11 @@ void PrefsManager::Init()
m_fSuperMeterPercentChangeNG = -0.20f; m_fSuperMeterPercentChangeNG = -0.20f;
m_bMercifulSuperMeter = true; m_bMercifulSuperMeter = true;
m_bDelayedEscape = true; m_bDelayedBack = true;
m_bInstructions = true; m_bShowInstructions = true;
m_bShowDontDie = true; m_bShowCaution = true;
m_bShowSelectGroup = true; m_bShowSelectGroup = true;
m_bShowNative = true; m_bShowNativeLanguage = true;
m_bArcadeOptionsNavigation = false; m_bArcadeOptionsNavigation = false;
m_bSoloSingle = false; m_bSoloSingle = false;
m_bDelayedTextureDelete = true; m_bDelayedTextureDelete = true;
@@ -464,13 +464,13 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG ); ini.GetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG );
ini.GetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter ); 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", "HiddenSongs", m_bHiddenSongs );
ini.GetValue( "Options", "Vsync", m_bVsync ); ini.GetValue( "Options", "Vsync", m_bVsync );
ini.GetValue( "Options", "HowToPlay", m_bInstructions ); ini.GetValue( "Options", "ShowInstructions", m_bShowInstructions );
ini.GetValue( "Options", "Caution", m_bShowDontDie ); ini.GetValue( "Options", "ShowCaution", m_bShowCaution );
ini.GetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); 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", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.GetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); ini.GetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete );
ini.GetValue( "Options", "TexturePreload", m_bTexturePreload ); ini.GetValue( "Options", "TexturePreload", m_bTexturePreload );
@@ -721,15 +721,15 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG ); ini.SetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG );
ini.SetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter ); 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", "HiddenSongs", m_bHiddenSongs );
ini.SetValue( "Options", "Vsync", m_bVsync ); ini.SetValue( "Options", "Vsync", m_bVsync );
ini.SetValue( "Options", "Interlaced", m_bInterlaced ); ini.SetValue( "Options", "Interlaced", m_bInterlaced );
ini.SetValue( "Options", "PAL", m_bPAL ); ini.SetValue( "Options", "PAL", m_bPAL );
ini.SetValue( "Options", "HowToPlay", m_bInstructions ); ini.SetValue( "Options", "ShowInstructions", m_bShowInstructions );
ini.SetValue( "Options", "Caution", m_bShowDontDie ); ini.SetValue( "Options", "ShowCaution", m_bShowCaution );
ini.SetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); 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", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.SetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); ini.SetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete );
ini.SetValue( "Options", "TexturePreload", m_bTexturePreload ); ini.SetValue( "Options", "TexturePreload", m_bTexturePreload );
stepmania/src/PrefsManager.h
+3 -3
View File
@@ -128,9 +128,9 @@ public:
bool m_bMercifulSuperMeter; // negative super deltas are scaled by the players life percentage bool m_bMercifulSuperMeter; // negative super deltas are scaled by the players life percentage
bool m_bAutoPlay; bool m_bAutoPlay;
bool m_bDelayedEscape; bool m_bDelayedBack;
bool m_bInstructions, m_bShowDontDie, m_bShowSelectGroup; bool m_bShowInstructions, m_bShowCaution, m_bShowSelectGroup;
bool m_bShowNative; bool m_bShowNativeLanguage;
bool m_bArcadeOptionsNavigation; bool m_bArcadeOptionsNavigation;
enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections; enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections;
int m_iMusicWheelSwitchSpeed; int m_iMusicWheelSwitchSpeed;
stepmania/src/Screen.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ void Screen::Update( float fDeltaTime )
void Screen::MenuBack( PlayerNumber pn, const InputEventType type ) 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); MenuBack(pn);
} }
stepmania/src/ScreenCaution.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ const ScreenMessage SM_StartClosing = ScreenMessage(SM_User-8);
REGISTER_SCREEN_CLASS( ScreenCaution ); REGISTER_SCREEN_CLASS( ScreenCaution );
ScreenCaution::ScreenCaution( CString sName ) : Screen( sName ) ScreenCaution::ScreenCaution( CString sName ) : Screen( sName )
{ {
if(!PREFSMAN->m_bShowDontDie) if(!PREFSMAN->m_bShowCaution)
{ {
this->PostScreenMessage( SM_GoToNextScreen, 0.f ); this->PostScreenMessage( SM_GoToNextScreen, 0.f );
return; return;
stepmania/src/ScreenGameplay.cpp
+3 -3
View File
@@ -1703,7 +1703,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
} }
if( MenuI.button == MENU_BUTTON_BACK && 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_SLOW_REPEAT||type==IET_FAST_REPEAT)) ||
(DeviceI.device!=DEVICE_KEYBOARD && 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; 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.SetText( "Continue holding BACK to quit" );
m_textDebug.StopTweening(); m_textDebug.StopTweening();
@@ -1742,7 +1742,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
return; 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.StopTweening();
m_textDebug.BeginTweening( 1/8.f ); m_textDebug.BeginTweening( 1/8.f );
stepmania/src/ScreenInstructions.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements
// //
// Skip this screen unless someone chose easy or beginner // Skip this screen unless someone chose easy or beginner
// //
if( !PREFSMAN->m_bInstructions ) if( !PREFSMAN->m_bShowInstructions )
{ {
HandleScreenMessage( SM_GoToNextScreen ); HandleScreenMessage( SM_GoToNextScreen );
return; return;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+4 -4
View File
@@ -199,14 +199,14 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const CStringArray &choices )
} }
/* Appearance options */ /* Appearance options */
MOVE( Instructions, PREFSMAN->m_bInstructions ); MOVE( Instructions, PREFSMAN->m_bShowInstructions );
MOVE( Caution, PREFSMAN->m_bShowDontDie ); MOVE( Caution, PREFSMAN->m_bShowCaution );
MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni ); MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni );
MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup ); MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup );
MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections ); MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections );
MOVE( CourseSort, PREFSMAN->m_iCourseSortOrder ); MOVE( CourseSort, PREFSMAN->m_iCourseSortOrder );
MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd ); MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd );
MOVE( Translations, PREFSMAN->m_bShowNative ); MOVE( Translations, PREFSMAN->m_bShowNativeLanguage );
MOVE( Lyrics, PREFSMAN->m_bShowLyrics ); MOVE( Lyrics, PREFSMAN->m_bShowLyrics );
/* Misc. options */ /* Misc. options */
@@ -236,7 +236,7 @@ static void NumBackgrounds( int &sel, bool ToSel, const CStringArray &choices )
MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange ); MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange );
MOVE( MenuButtons, PREFSMAN->m_bOnlyDedicatedMenuButtons ); MOVE( MenuButtons, PREFSMAN->m_bOnlyDedicatedMenuButtons );
MOVE( AutoPlay, PREFSMAN->m_bAutoPlay ); MOVE( AutoPlay, PREFSMAN->m_bAutoPlay );
MOVE( BackDelayed, PREFSMAN->m_bDelayedEscape ); MOVE( BackDelayed, PREFSMAN->m_bDelayedBack );
MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation ); MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation );
static void WheelSpeed( int &sel, bool ToSel, const CStringArray &choices ) static void WheelSpeed( int &sel, bool ToSel, const CStringArray &choices )
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -735,7 +735,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F9 ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F9 )
{ {
if( type != IET_FIRST_PRESS ) return; if( type != IET_FIRST_PRESS ) return;
PREFSMAN->m_bShowNative ^= 1; PREFSMAN->m_bShowNativeLanguage ^= 1;
m_MusicWheel.RebuildMusicWheelItems(); m_MusicWheel.RebuildMusicWheelItems();
m_CourseContentsFrame.SetFromGameState(); m_CourseContentsFrame.SetFromGameState();
return; return;
stepmania/src/Song.cpp
+3 -3
View File
@@ -1257,19 +1257,19 @@ CString Song::GetBackgroundPath() const
CString Song::GetDisplayMainTitle() const CString Song::GetDisplayMainTitle() const
{ {
if(!PREFSMAN->m_bShowNative) return GetTranslitMainTitle(); if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitMainTitle();
return m_sMainTitle; return m_sMainTitle;
} }
CString Song::GetDisplaySubTitle() const CString Song::GetDisplaySubTitle() const
{ {
if(!PREFSMAN->m_bShowNative) return GetTranslitSubTitle(); if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitSubTitle();
return m_sSubTitle; return m_sSubTitle;
} }
CString Song::GetDisplayArtist() const CString Song::GetDisplayArtist() const
{ {
if(!PREFSMAN->m_bShowNative) return GetTranslitArtist(); if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitArtist();
return m_sArtist; return m_sArtist;
} }