From ec91c4030a5aef6b916003f326e0920991516bd2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 27 Jun 2006 23:15:56 +0000 Subject: [PATCH] remove OVERRIDE_LOCK_INPUT_SECONDS, LOCK_INPUT_SECONDS; handle "tiny lock" generally; don't move "lock by tween time" just yet --- stepmania/src/Screen.cpp | 3 +++ stepmania/src/ScreenSelectMaster.cpp | 8 ++------ stepmania/src/ScreenSelectMaster.h | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index c8604675ee..d461df4a88 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -76,6 +76,9 @@ void Screen::BeginScreen() m_fLockInputSecs = 0; 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 ) diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 18d65a5fec..ed44b5a1bf 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -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_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" ); - LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" ); PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" ); POST_SWITCH_PAGE_SECONDS.Load( m_sName, "PostSwitchPageSeconds" ); OPTION_ORDER.Load( m_sName, OPTION_ORDER_NAME, NUM_MENU_DIRS ); @@ -263,11 +261,9 @@ void ScreenSelectMaster::BeginScreen() this->UpdateSelectableChoices(); - ScreenSelect::BeginScreen(); + m_fLockInputSecs = this->GetTweenTimeLeft(); - m_fLockInputSecs = (bool)OVERRIDE_LOCK_INPUT_SECONDS ? LOCK_INPUT_SECONDS : this->GetTweenTimeLeft(); - 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. + ScreenSelect::BeginScreen(); } void ScreenSelectMaster::Update( float fDelta ) diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h index 29b957f18a..aa758c498a 100644 --- a/stepmania/src/ScreenSelectMaster.h +++ b/stepmania/src/ScreenSelectMaster.h @@ -43,8 +43,6 @@ protected: ThemeMetric1D CURSOR_OFFSET_X_FROM_ICON; ThemeMetric1D CURSOR_OFFSET_Y_FROM_ICON; ThemeMetric PER_CHOICE_ICON_ELEMENT; - ThemeMetric OVERRIDE_LOCK_INPUT_SECONDS; - ThemeMetric LOCK_INPUT_SECONDS; ThemeMetric PRE_SWITCH_PAGE_SECONDS; ThemeMetric POST_SWITCH_PAGE_SECONDS; ThemeMetric1D OPTION_ORDER;