merge m_fLockInputSecs's

stepmania/src/Screen.cpp

@@ -40,6 +40,8 @@ void Screen::Init()
 {
 	ALLOW_OPERATOR_MENU_BUTTON.Load( m_sName, "AllowOperatorMenuButton" );
 
+	m_fLockInputSecs = 0;
+
 	SetFOV( 0 );
 
 	m_smSendOnPop = SM_None;
@@ -79,6 +81,8 @@ void Screen::BeginScreen()
 void Screen::Update( float fDeltaTime )
 {
 	ActorFrame::Update( fDeltaTime );
+	
+	m_fLockInputSecs = max( 0, m_fLockInputSecs-fDeltaTime );
 
 	/*
 	 * We need to ensure two things:

stepmania/src/Screen.h

@@ -82,6 +82,8 @@ protected:
 	RString m_sNextScreen;
 	ScreenMessage m_smSendOnPop;
 
+	float                           m_fLockInputSecs;
+
 public:
 	RString GetNextScreen() const;
 	RString GetPrevScreen() const;

stepmania/src/ScreenOptions.cpp

@@ -484,8 +484,6 @@ void ScreenOptions::Update( float fDeltaTime )
 {
 	//LOG->Trace( "ScreenOptions::Update(%f)", fDeltaTime );
 
-	m_fLockInputSecs = max( 0, m_fLockInputSecs-fDeltaTime );
-
 	ScreenWithMenuElements::Update( fDeltaTime );
 }
 

stepmania/src/ScreenOptions.h

@@ -103,7 +103,6 @@ protected:	// derived classes need access to these
 
 	int			m_iFocusX[NUM_PLAYERS];
 	bool			m_bWasOnExit[NUM_PLAYERS];
-	float			m_fLockInputSecs;
 
 	// TRICKY: People hold Start to get to PlayerOptions, then 
 	// the repeat events cause them to zip to the bottom.  So, ignore

stepmania/src/ScreenSelectMaster.cpp

@@ -27,7 +27,6 @@ ScreenSelectMaster::ScreenSelectMaster()
 {
 	ZERO( m_iChoice );
 	ZERO( m_bChosen );
-	m_fLockInputSecs = 0;
 }
 
 void ScreenSelectMaster::Init()
@@ -274,7 +273,6 @@ void ScreenSelectMaster::BeginScreen()
 void ScreenSelectMaster::Update( float fDelta )
 {
 	ScreenSelect::Update( fDelta );
-	m_fLockInputSecs = max( 0, m_fLockInputSecs-fDelta );
 }
 
 void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )

stepmania/src/ScreenSelectMaster.h

@@ -91,7 +91,6 @@ protected:
 	int m_iChoice[NUM_PLAYERS];
 	bool m_bChosen[NUM_PLAYERS];
 
-	float m_fLockInputSecs;
 	MenuInput m_TrackingRepeatingInput;
 };