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 -4
View File
@@ -356,8 +356,6 @@ bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button )
/* Given a DeviceInput that was just depressed, return an active edit function. */
bool ScreenEdit::MenuInputToEditButton( const MenuInput &MenuI, EditButton &button ) const
{
ASSERT( MenuI.IsValid() );
const MapEditButtonToMenuButton *pCurrentMap = GetCurrentMenuButtonMap();
FOREACH_EditButton(e)
@@ -1088,8 +1086,7 @@ void ScreenEdit::Input( const InputEventPlus &input )
EditButton EditB;
if( !DeviceToEdit( input.DeviceI, EditB ) )
if( input.MenuI.IsValid() )
MenuInputToEditButton( input.MenuI, EditB );
MenuInputToEditButton( input.MenuI, EditB );
if( EditB == EDIT_BUTTON_REMOVE_NOTE )