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

split SongsPerPlay and EventMode

Browse Source
This commit is contained in:
Chris Danford
2004-06-12 02:53:21 +00:00
parent 0805aef930
commit d4ca0684f0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -1
View File
@@ -3400,12 +3400,13 @@ Line6=conf,WheelSpeed
[ScreenCoinOptions] [ScreenCoinOptions]
Fallback=ScreenOptionsSubmenu Fallback=ScreenOptionsSubmenu
LineNames=1,2,3,4 LineNames=1,2,3,4,5
OptionMenuFlags=together;explanations OptionMenuFlags=together;explanations
Line1=conf,CoinMode Line1=conf,CoinMode
Line2=conf,SongsPerPlay Line2=conf,SongsPerPlay
Line3=conf,CoinsPerCredit Line3=conf,CoinsPerCredit
Line4=conf,Premium Line4=conf,Premium
Line5=conf,EventMode
[ScreenMachineOptions] [ScreenMachineOptions]
Fallback=ScreenOptionsSubmenu Fallback=ScreenOptionsSubmenu
stepmania/src/ScreenOptionsMasterPrefs.cpp
+4 -7
View File
@@ -288,14 +288,10 @@ static void Premium( int &sel, bool ToSel, const CStringArray &choices )
static void SongsPerPlay( 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) ); 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 */ /* Machine options */
MOVE( MenuTimer, PREFSMAN->m_bMenuTimer ); MOVE( MenuTimer, PREFSMAN->m_bMenuTimer );
@@ -466,7 +462,8 @@ static const ConfOption g_ConfOptions[] =
ConfOption( "Menu\nTimer", MenuTimer, "OFF","ON" ), ConfOption( "Menu\nTimer", MenuTimer, "OFF","ON" ),
ConfOption( "CoinMode", CoinMode, "HOME","PAY","FREE PLAY" ), ConfOption( "CoinMode", CoinMode, "HOME","PAY","FREE PLAY" ),
ConfOption( "CoinModeNoHome", CoinModeNoHome, "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( "Scoring\nType", ScoringType, "MAX2","5TH" ),
ConfOption( "Judge\nDifficulty", JudgeDifficulty, "1","2","3","4","5","6","7","8","JUSTICE" ), ConfOption( "Judge\nDifficulty", JudgeDifficulty, "1","2","3","4","5","6","7","8","JUSTICE" ),
ConfOption( "Life\nDifficulty", LifeDifficulty, "1","2","3","4","5","6","7" ), ConfOption( "Life\nDifficulty", LifeDifficulty, "1","2","3","4","5","6","7" ),