From feb3d5104d11fc7063eb45c92a6722027c2f2d5c Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 28 Mar 2010 13:46:42 -0500 Subject: [PATCH] add [ScreenSelectMusic] TwoPartTimerSeconds metric --- Themes/_fallback/metrics.ini | 1 + src/ScreenSelectMusic.cpp | 4 ++-- src/ScreenSelectMusic.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index bb22422555..bab64a576d 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1631,6 +1631,7 @@ NextSongButton="MenuRight" # TwoPartSelection=false TwoPartConfirmsOnly=false +TwoPartTimerSeconds=15 # SampleMusicDelay=0.25 SampleMusicDelayInit=0 diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index e01a56e7e7..adefc241ca 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -87,6 +87,7 @@ void ScreenSelectMusic::Init() SELECT_MENU_CHANGES_DIFFICULTY.Load( m_sName, "SelectMenuChangesDifficulty" ); TWO_PART_SELECTION.Load( m_sName, "TwoPartSelection" ); TWO_PART_CONFIRMS_ONLY.Load( m_sName, "TwoPartConfirmsOnly" ); + TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" ); WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" ); m_GameButtonPreviousSong = INPUTMAPPER->GetInputScheme()->ButtonNameToIndex( THEME->GetMetric(m_sName,"PreviousSongButton") ); @@ -1219,8 +1220,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input ) float fSeconds = m_MenuTimer->GetSeconds(); if( fSeconds < 10 ) { - // TODO: make this a theme metric -aj - m_MenuTimer->SetSeconds( 13 ); + m_MenuTimer->SetSeconds( TWO_PART_TIMER_SECONDS ); // was 13 -aj m_MenuTimer->Start(); } } diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index 8318077029..1961b7d703 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -86,6 +86,7 @@ protected: ThemeMetric SELECT_MENU_CHANGES_DIFFICULTY; ThemeMetric TWO_PART_SELECTION; ThemeMetric TWO_PART_CONFIRMS_ONLY; + ThemeMetric TWO_PART_TIMER_SECONDS; ThemeMetric WRAP_CHANGE_STEPS; bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }