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

add metric to disable roulette on menu timer

Browse Source
This commit is contained in:
Chris Danford
2004-01-11 07:18:51 +00:00
parent bb514a1a51
commit 12e49744a1
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -747,6 +747,7 @@ NextOptionsScreenOni=ScreenPlayerOptions
NextOptionsScreenEndless=ScreenPlayerOptions NextOptionsScreenEndless=ScreenPlayerOptions
NextOptionsScreenBattle=ScreenPlayerOptions NextOptionsScreenBattle=ScreenPlayerOptions
NextOptionsScreenRave=ScreenRaveOptions NextOptionsScreenRave=ScreenRaveOptions
DoRouletteOnMenuTimer=1
[ScreenEz2SelectMusic] [ScreenEz2SelectMusic]
UseModeSwitcher=0 UseModeSwitcher=0
stepmania/src/ScreenSelectMusic.cpp
+11 -1
View File
@@ -58,6 +58,7 @@ const int NUM_SCORE_DIGITS = 9;
#define NEXT_OPTIONS_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextOptionsScreen"+Capitalize(PlayModeToString(play_mode))) #define NEXT_OPTIONS_SCREEN( play_mode ) THEME->GetMetric ("ScreenSelectMusic","NextOptionsScreen"+Capitalize(PlayModeToString(play_mode)))
#define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreP%iSortChangeCommand", i+1)) #define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreP%iSortChangeCommand", i+1))
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreFrameP%iSortChangeCommand", i+1)) #define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
#define DO_ROULETTE_ON_MENU_TIMER THEME->GetMetricB("ScreenSelectMusic","DoRouletteOnMenuTimer")
static const ScreenMessage SM_AllowOptionsMenuRepeat = ScreenMessage(SM_User+1); static const ScreenMessage SM_AllowOptionsMenuRepeat = ScreenMessage(SM_User+1);
CString g_sFallbackCDTitlePath; CString g_sFallbackCDTitlePath;
@@ -814,7 +815,9 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
m_Menu.m_MenuTimer->SetSeconds( 15 ); m_Menu.m_MenuTimer->SetSeconds( 15 );
m_Menu.m_MenuTimer->Start(); m_Menu.m_MenuTimer->Start();
} }
else if( m_MusicWheel.GetSelectedType() != TYPE_SONG ) else if( DO_ROULETTE_ON_MENU_TIMER )
{
if( m_MusicWheel.GetSelectedType() != TYPE_SONG )
{ {
m_MusicWheel.StartRoulette(); m_MusicWheel.StartRoulette();
m_Menu.m_MenuTimer->SetSeconds( 15 ); m_Menu.m_MenuTimer->SetSeconds( 15 );
@@ -824,6 +827,13 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
{ {
MenuStart(PLAYER_INVALID); MenuStart(PLAYER_INVALID);
} }
}
else
{
if( m_MusicWheel.GetSelectedType() != TYPE_SONG )
m_MusicWheel.StartRandom();
MenuStart(PLAYER_INVALID);
}
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) );