remove MenuInput.IsValid(); if invalid, the button is simply MenuButton_INVALID

This commit is contained in:
Glenn Maynard
2006-09-14 20:31:46 +00:00
parent c559ff69b6
commit f1cd95828e
10 changed files with 51 additions and 69 deletions
+1 -2
View File
@@ -83,7 +83,6 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input )
if( m_bAskOptionsMessage &&
input.type == IET_FIRST_PRESS &&
!m_In.IsTransitioning() &&
input.MenuI.IsValid() &&
input.MenuI == MENU_BUTTON_START )
{
if( m_bAcceptedChoices && !m_bGoToOptions )
@@ -119,7 +118,7 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input )
ScreenOptionsMaster::Input( input );
// UGLY: Update m_Disqualified whenever Start is pressed
if( GAMESTATE->IsHumanPlayer(pn) && input.MenuI.IsValid() && input.MenuI == MENU_BUTTON_START )
if( GAMESTATE->IsHumanPlayer(pn) && input.MenuI == MENU_BUTTON_START )
{
int row = m_iCurrentRow[pn];
UpdateDisqualified( row, pn );