From d4ca0684f0a4ace8279f235fde356bc415b91a29 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 12 Jun 2004 02:53:21 +0000 Subject: [PATCH] split SongsPerPlay and EventMode --- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/ScreenOptionsMasterPrefs.cpp | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ecf35be72b..0ced01b612 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3400,12 +3400,13 @@ Line6=conf,WheelSpeed [ScreenCoinOptions] Fallback=ScreenOptionsSubmenu -LineNames=1,2,3,4 +LineNames=1,2,3,4,5 OptionMenuFlags=together;explanations Line1=conf,CoinMode Line2=conf,SongsPerPlay Line3=conf,CoinsPerCredit Line4=conf,Premium +Line5=conf,EventMode [ScreenMachineOptions] Fallback=ScreenOptionsSubmenu diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 12db8f0bb5..ddc7c5f2ea 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -288,14 +288,10 @@ static void Premium( int &sel, bool ToSel, const CStringArray &choices ) static void SongsPerPlay( int &sel, bool ToSel, const CStringArray &choices ) { - const int mapping[] = { 1,2,3,4,5,6,7,8 }; + const int mapping[] = { 1,2,3,4,5,6,7 }; 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 */ MOVE( MenuTimer, PREFSMAN->m_bMenuTimer ); @@ -466,7 +462,8 @@ static const ConfOption g_ConfOptions[] = ConfOption( "Menu\nTimer", MenuTimer, "OFF","ON" ), ConfOption( "CoinMode", CoinMode, "HOME","PAY","FREE PLAY" ), ConfOption( "CoinModeNoHome", CoinModeNoHome, "PAY","FREE PLAY" ), - ConfOption( "Songs Per\nPlay", SongsPerPlay, "1","2","3","4","5","6","7","EVENT MODE" ), + ConfOption( "Songs Per\nPlay", SongsPerPlay, "1","2","3","4","5","6","7" ), + ConfOption( "Event\nMode", EventMode, "OFF","ON" ), ConfOption( "Scoring\nType", ScoringType, "MAX2","5TH" ), ConfOption( "Judge\nDifficulty", JudgeDifficulty, "1","2","3","4","5","6","7","8","JUSTICE" ), ConfOption( "Life\nDifficulty", LifeDifficulty, "1","2","3","4","5","6","7" ),