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

add PerChoiceIconElement metric (remove this metric and make it the default eventually)

Browse Source
This commit is contained in:
Chris Danford
2006-01-29 22:18:28 +00:00
parent 370d11ee19
commit b792e48616
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+6 -1
View File
@@ -32,6 +32,7 @@ void ScreenSelectMaster::Init()
NUM_CHOICES_ON_PAGE_1.Load( m_sName, "NumChoicesOnPage1" ); NUM_CHOICES_ON_PAGE_1.Load( m_sName, "NumChoicesOnPage1" );
CURSOR_OFFSET_X_FROM_ICON.Load( m_sName, CURSOR_OFFSET_X_FROM_ICON_NAME, NUM_PLAYERS ); CURSOR_OFFSET_X_FROM_ICON.Load( m_sName, CURSOR_OFFSET_X_FROM_ICON_NAME, NUM_PLAYERS );
CURSOR_OFFSET_Y_FROM_ICON.Load( m_sName, CURSOR_OFFSET_Y_FROM_ICON_NAME, NUM_PLAYERS ); CURSOR_OFFSET_Y_FROM_ICON.Load( m_sName, CURSOR_OFFSET_Y_FROM_ICON_NAME, NUM_PLAYERS );
PER_CHOICE_ICON_ELEMENT.Load( m_sName, "PerChoiceIconElement" );
OVERRIDE_LOCK_INPUT_SECONDS.Load( m_sName, "OverrideLockInputSeconds" ); OVERRIDE_LOCK_INPUT_SECONDS.Load( m_sName, "OverrideLockInputSeconds" );
LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" ); LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" );
PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" ); PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" );
@@ -96,7 +97,11 @@ void ScreenSelectMaster::Init()
// init icon // init icon
if( SHOW_ICON ) if( SHOW_ICON )
{ {
RString sElement = ssprintf( "Icon Choice%s", mc.m_sName.c_str() ); vector<RString> vs;
vs.push_back( "Icon" );
if( PER_CHOICE_ICON_ELEMENT )
vs.push_back( "Choice" + mc.m_sName );
RString sElement = join( " ", vs );
m_vsprIcon[c].Load( THEME->GetPathG(m_sName,sElement) ); m_vsprIcon[c].Load( THEME->GetPathG(m_sName,sElement) );
sElement.Replace( " ", "" ); sElement.Replace( " ", "" );
m_vsprIcon[c]->SetName( sElement ); m_vsprIcon[c]->SetName( sElement );
stepmania/src/ScreenSelectMaster.h
+1
View File
@@ -39,6 +39,7 @@ protected:
ThemeMetric<int> NUM_CHOICES_ON_PAGE_1; ThemeMetric<int> NUM_CHOICES_ON_PAGE_1;
ThemeMetric1D<float> CURSOR_OFFSET_X_FROM_ICON; ThemeMetric1D<float> CURSOR_OFFSET_X_FROM_ICON;
ThemeMetric1D<float> CURSOR_OFFSET_Y_FROM_ICON; ThemeMetric1D<float> CURSOR_OFFSET_Y_FROM_ICON;
ThemeMetric<bool> PER_CHOICE_ICON_ELEMENT;
ThemeMetric<bool> OVERRIDE_LOCK_INPUT_SECONDS; ThemeMetric<bool> OVERRIDE_LOCK_INPUT_SECONDS;
ThemeMetric<float> LOCK_INPUT_SECONDS; ThemeMetric<float> LOCK_INPUT_SECONDS;
ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS; ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS;