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

add [ScreenSelectMusic] TwoPartTimerSeconds metric

Browse Source
This commit is contained in:
AJ Kelly
2010-03-28 13:46:42 -05:00
parent bdeb114a09
commit feb3d5104d
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+1
View File
@@ -1631,6 +1631,7 @@ NextSongButton="MenuRight"
# #
TwoPartSelection=false TwoPartSelection=false
TwoPartConfirmsOnly=false TwoPartConfirmsOnly=false
TwoPartTimerSeconds=15
# #
SampleMusicDelay=0.25 SampleMusicDelay=0.25
SampleMusicDelayInit=0 SampleMusicDelayInit=0
src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -87,6 +87,7 @@ void ScreenSelectMusic::Init()
SELECT_MENU_CHANGES_DIFFICULTY.Load( m_sName, "SelectMenuChangesDifficulty" ); SELECT_MENU_CHANGES_DIFFICULTY.Load( m_sName, "SelectMenuChangesDifficulty" );
TWO_PART_SELECTION.Load( m_sName, "TwoPartSelection" ); TWO_PART_SELECTION.Load( m_sName, "TwoPartSelection" );
TWO_PART_CONFIRMS_ONLY.Load( m_sName, "TwoPartConfirmsOnly" ); TWO_PART_CONFIRMS_ONLY.Load( m_sName, "TwoPartConfirmsOnly" );
TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" );
WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" ); WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" );
m_GameButtonPreviousSong = INPUTMAPPER->GetInputScheme()->ButtonNameToIndex( THEME->GetMetric(m_sName,"PreviousSongButton") ); 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(); float fSeconds = m_MenuTimer->GetSeconds();
if( fSeconds < 10 ) if( fSeconds < 10 )
{ {
// TODO: make this a theme metric -aj m_MenuTimer->SetSeconds( TWO_PART_TIMER_SECONDS ); // was 13 -aj
m_MenuTimer->SetSeconds( 13 );
m_MenuTimer->Start(); m_MenuTimer->Start();
} }
} }
src/ScreenSelectMusic.h
+1
View File
@@ -86,6 +86,7 @@ protected:
ThemeMetric<bool> SELECT_MENU_CHANGES_DIFFICULTY; ThemeMetric<bool> SELECT_MENU_CHANGES_DIFFICULTY;
ThemeMetric<bool> TWO_PART_SELECTION; ThemeMetric<bool> TWO_PART_SELECTION;
ThemeMetric<bool> TWO_PART_CONFIRMS_ONLY; ThemeMetric<bool> TWO_PART_CONFIRMS_ONLY;
ThemeMetric<float> TWO_PART_TIMER_SECONDS;
ThemeMetric<bool> WRAP_CHANGE_STEPS; ThemeMetric<bool> WRAP_CHANGE_STEPS;
bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; } bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }