bring back old merged SongsPerPlayOrEvent conf option

This commit is contained in:
Glenn Maynard
2005-02-19 09:16:16 +00:00
parent 23dccd1af2
commit 014a3d65b1
@@ -320,6 +320,16 @@ static void SongsPerPlay( int &sel, bool ToSel, const ConfOption *pConfOption )
const int mapping[] = { 1,2,3,4,5,6,7 };
MoveMap( sel, PREFSMAN->m_iNumArcadeStages, ToSel, mapping, ARRAYSIZE(mapping) );
}
static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pConfOption )
{
const int mapping[] = { 1,2,3,4,5,6,7,8 };
MoveMap( sel, PREFSMAN->m_iNumArcadeStages, ToSel, mapping, ARRAYSIZE(mapping) );
if( ToSel && PREFSMAN->m_bEventMode )
sel = 7;
if( !ToSel )
PREFSMAN->m_bEventMode = (sel == 7);
}
MOVE( EventMode, PREFSMAN->m_bEventMode );
/* Machine options */
@@ -536,6 +546,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "CoinMode", CoinModeM, "HOME","PAY","FREE PLAY" ) );
ADD( ConfOption( "CoinModeNoHome", CoinModeNoHome, "PAY","FREE PLAY" ) );
ADD( ConfOption( "Songs Per\nPlay", SongsPerPlay, "1","2","3","4","5","6","7" ) );
ADD( ConfOption( "SongsPerPlayOrEvent", SongsPerPlayOrEventMode, "1","2","3","4","5","6","7","EVENT" ) );
ADD( ConfOption( "Event\nMode", EventMode, "OFF","ON" ) );
ADD( ConfOption( "Scoring\nType", ScoringType, "MAX2","5TH" ) );
ADD( ConfOption( "Judge\nDifficulty", JudgeDifficulty, "1","2","3","4","5","6","7","8","JUSTICE" ) );