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

cleanup: Don't use HasMetric. It's makes metrics hard to discover.

Browse Source
This commit is contained in:
Chris Danford
2005-03-02 04:35:12 +00:00
parent b0b83591c2
commit 85ee5049d2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+4 -4
View File
@@ -31,6 +31,8 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"),
CURSOR_OFFSET_X_FROM_ICON(m_sName,CURSOR_OFFSET_X_FROM_ICON_NAME,NUM_PLAYERS,NUM_CURSOR_PARTS),
CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS,NUM_CURSOR_PARTS),
OVERRIDE_LOCK_INPUT_SECONDS(m_sName,"OverrideLockInputSeconds"),
LOCK_INPUT_SECONDS(m_sName,"LockInputSeconds"),
PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"OverrideSleepAfterTweenOffSeconds"),
@@ -256,10 +258,8 @@ void ScreenSelectMaster::Init()
this->UpdateSelectableChoices();
TweenOnScreen();
m_fLockInputSecs =
THEME->HasMetric(m_sName,"LockInputSeconds") ?
THEME->GetMetricF(m_sName,"LockInputSeconds") :
this->GetTweenTimeLeft();
m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft();
}
void ScreenSelectMaster::Update( float fDelta )
stepmania/src/ScreenSelectMaster.h
+2
View File
@@ -44,6 +44,8 @@ protected:
ThemeMetric<int> NUM_CHOICES_ON_PAGE_1;
ThemeMetric2D<float> CURSOR_OFFSET_X_FROM_ICON;
ThemeMetric2D<float> CURSOR_OFFSET_Y_FROM_ICON;
ThemeMetric<bool> OVERRIDE_LOCK_INPUT_SECONDS;
ThemeMetric<float> LOCK_INPUT_SECONDS;
ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS;
ThemeMetric<float> POST_SWITCH_PAGE_SECONDS;
ThemeMetric<bool> OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS;