From 2f09374c089e853ea45acea0dbe7549cdd41f276 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 6 Oct 2003 05:59:58 +0000 Subject: [PATCH] move some options to "Coin Options" group --- stepmania/src/ScreenOptionsMasterPrefs.cpp | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 655329b9df..81400ebf07 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -253,9 +253,30 @@ MOVE( MarvelousTiming, PREFSMAN->m_iMarvelousTiming ); MOVE( PickExtraStage, PREFSMAN->m_bPickExtraStage ); MOVE( UnlockSystem, PREFSMAN->m_bUseUnlockSystem ); +/* Coin options */ +MOVE( CoinMode, PREFSMAN->m_iCoinMode ); + +static void CoinsPerCredit( int &sel, bool ToSel, const CStringArray &choices ) +{ + const int mapping[] = { 1,2,3,4,5,6,7,8 }; + MoveMap( sel, PREFSMAN->m_iCoinsPerCredit, ToSel, mapping, ARRAYSIZE(mapping) ); +} + +MOVE( JointPremium, PREFSMAN->m_bJointPremium ); + +static void SongsPerPlay( int &sel, bool ToSel, const CStringArray &choices ) +{ + 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); +} + /* Machine options */ MOVE( MenuTimer, PREFSMAN->m_bMenuTimer ); -MOVE( CoinMode, PREFSMAN->m_iCoinMode ); MOVE( ScoringType, PREFSMAN->m_iScoringType ); static void JudgeDifficulty( int &sel, bool ToSel, const CStringArray &choices ) @@ -276,12 +297,6 @@ static void ShowSongOptions( int &sel, bool ToSel, const CStringArray &choices ) MoveMap( sel, PREFSMAN->m_ShowSongOptions, ToSel, mapping, ARRAYSIZE(mapping) ); } -static void CoinsPerCredit( int &sel, bool ToSel, const CStringArray &choices ) -{ - const int mapping[] = { 1,2,3,4,5,6,7,8 }; - MoveMap( sel, PREFSMAN->m_iCoinsPerCredit, ToSel, mapping, ARRAYSIZE(mapping) ); -} - static void DefaultFailType( int &sel, bool ToSel, const CStringArray &choices ) { if( ToSel ) @@ -311,20 +326,6 @@ MOVE( ProgressiveLifebar, PREFSMAN->m_iProgressiveLifebar ); MOVE( ProgressiveStageLifebar, PREFSMAN->m_iProgressiveStageLifebar ); MOVE( ProgressiveNonstopLifebar, PREFSMAN->m_iProgressiveNonstopLifebar ); -MOVE( JointPremium, PREFSMAN->m_bJointPremium ); - - -static void SongsPerPlay( int &sel, bool ToSel, const CStringArray &choices ) -{ - 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); -} - /* Graphic options */ MOVE( DisplayMode, PREFSMAN->m_bWindowed ); MOVE( WaitForVsync, PREFSMAN->m_bVsync );