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

move MovePref; rename Caution -> ShowCaution and simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-24 06:28:15 +00:00
parent d7800a2822
commit 37fdbdede3
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+18 -19
View File
@@ -92,6 +92,23 @@ static void MoveMap( int &sel, IPreference &pOption, bool ToSel, const float *ma
} }
} }
static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption )
{
IPreference *pPref = PREFSMAN->GetPreferenceByName( pConfOption->name );
ASSERT_M( pPref != NULL, pConfOption->name );
if( bToSel )
{
const CString sVal = pPref->ToString();
iSel = atoi( sVal );
}
else
{
const CString sVal = ToString(iSel);
pPref->FromString( sVal );
}
}
/* "sel" is the selection in the menu. */ /* "sel" is the selection in the menu. */
static void MoveData( int &sel, int &opt, bool ToSel ) static void MoveData( int &sel, int &opt, bool ToSel )
{ {
@@ -249,26 +266,8 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const ConfOption *pConfOption
} }
} }
static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption )
{
IPreference *pPref = PREFSMAN->GetPreferenceByName( pConfOption->name );
ASSERT_M( pPref != NULL, pConfOption->name );
if( bToSel )
{
const CString sVal = pPref->ToString();
iSel = atoi( sVal );
}
else
{
const CString sVal = ToString(iSel);
pPref->FromString( sVal );
}
}
/* Appearance options */ /* Appearance options */
MOVE( Instructions, PREFSMAN->m_bShowInstructions ); MOVE( Instructions, PREFSMAN->m_bShowInstructions );
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, (int &) PREFSMAN->m_MusicWheelUsesSections ); MOVE( WheelSections, (int &) PREFSMAN->m_MusicWheelUsesSections );
@@ -531,7 +530,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "Announcer", Announcer, AnnouncerChoices ) ); ADD( ConfOption( "Announcer", Announcer, AnnouncerChoices ) );
ADD( ConfOption( "Default\nNoteSkin", DefaultNoteSkin, DefaultNoteSkinChoices ) ); ADD( ConfOption( "Default\nNoteSkin", DefaultNoteSkin, DefaultNoteSkinChoices ) );
ADD( ConfOption( "Instructions", Instructions, "SKIP","SHOW") ); ADD( ConfOption( "Instructions", Instructions, "SKIP","SHOW") );
ADD( ConfOption( "Caution", Caution, "SKIP","SHOW") ); ADD( ConfOption( "ShowCaution", MovePref, "SKIP","SHOW") );
ADD( ConfOption( "Oni Score\nDisplay", OniScoreDisplay, "PERCENT","DANCE POINTS") ); ADD( ConfOption( "Oni Score\nDisplay", OniScoreDisplay, "PERCENT","DANCE POINTS") );
ADD( ConfOption( "Song\nGroup", SongGroup, "ALL MUSIC","CHOOSE") ); ADD( ConfOption( "Song\nGroup", SongGroup, "ALL MUSIC","CHOOSE") );
ADD( ConfOption( "Wheel\nSections", WheelSections, "NEVER","ALWAYS", "ABC ONLY") ); ADD( ConfOption( "Wheel\nSections", WheelSections, "NEVER","ALWAYS", "ABC ONLY") );