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

remove OVERRIDE_LOCK_INPUT_SECONDS, LOCK_INPUT_SECONDS; handle "tiny lock" generally; don't move "lock by tween time" just yet

Browse Source
This commit is contained in:
Glenn Maynard
2006-06-27 23:15:56 +00:00
parent c4b0074ff0
commit ec91c4030a
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Screen.cpp
+3
View File
@@ -76,6 +76,9 @@ void Screen::BeginScreen()
m_fLockInputSecs = 0; m_fLockInputSecs = 0;
this->RunCommands( THEME->GetMetricA(m_sName, "ScreenOnCommand") ); this->RunCommands( THEME->GetMetricA(m_sName, "ScreenOnCommand") );
if( m_fLockInputSecs == 0 )
m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load.
} }
void Screen::Update( float fDeltaTime ) void Screen::Update( float fDeltaTime )
stepmania/src/ScreenSelectMaster.cpp
+2 -6
View File
@@ -40,8 +40,6 @@ void ScreenSelectMaster::Init()
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" ); PER_CHOICE_ICON_ELEMENT.Load( m_sName, "PerChoiceIconElement" );
OVERRIDE_LOCK_INPUT_SECONDS.Load( m_sName, "OverrideLockInputSeconds" );
LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" );
PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" ); PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" );
POST_SWITCH_PAGE_SECONDS.Load( m_sName, "PostSwitchPageSeconds" ); POST_SWITCH_PAGE_SECONDS.Load( m_sName, "PostSwitchPageSeconds" );
OPTION_ORDER.Load( m_sName, OPTION_ORDER_NAME, NUM_MENU_DIRS ); OPTION_ORDER.Load( m_sName, OPTION_ORDER_NAME, NUM_MENU_DIRS );
@@ -263,11 +261,9 @@ void ScreenSelectMaster::BeginScreen()
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();
ScreenSelect::BeginScreen(); m_fLockInputSecs = this->GetTweenTimeLeft();
m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft(); ScreenSelect::BeginScreen();
if( m_fLockInputSecs == 0 )
m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load.
} }
void ScreenSelectMaster::Update( float fDelta ) void ScreenSelectMaster::Update( float fDelta )
stepmania/src/ScreenSelectMaster.h
-2
View File
@@ -43,8 +43,6 @@ protected:
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> PER_CHOICE_ICON_ELEMENT;
ThemeMetric<bool> OVERRIDE_LOCK_INPUT_SECONDS;
ThemeMetric<float> LOCK_INPUT_SECONDS;
ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS; ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS;
ThemeMetric<float> POST_SWITCH_PAGE_SECONDS; ThemeMetric<float> POST_SWITCH_PAGE_SECONDS;
ThemeMetric1D<RString> OPTION_ORDER; ThemeMetric1D<RString> OPTION_ORDER;