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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-14 21:02:14 +00:00
parent 13fb874cc6
commit ab45febba3
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+11 -20
View File
@@ -307,7 +307,7 @@ void ScreenEdit::InitEditMappings()
#endif
/* Given a DeviceInput that was just depressed, return an active edit function. */
bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button ) const
EditButton ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI ) const
{
ASSERT( DeviceI.IsValid() );
@@ -320,15 +320,12 @@ bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button )
{
if( pCurrentMap->button[e][slot] == DeviceI && pCurrentMap->hold[e][0].IsValid() )
{
/* The button maps to this function. */
button = e;
/* This function has one or more shift modifier attached. */
/* The button maps to this function, and has one or more shift modifiers attached. */
for( int holdslot = 0; holdslot < NUM_EDIT_TO_DEVICE_SLOTS; ++holdslot )
{
DeviceInput hDI = pCurrentMap->hold[e][holdslot];
if( hDI.IsValid() && INPUTFILTER->IsBeingPressed(hDI) )
return true;
return e;
}
}
}
@@ -342,19 +339,16 @@ bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button )
if( pCurrentMap->button[e][slot] == DeviceI && !pCurrentMap->hold[e][0].IsValid() )
{
/* The button maps to this function. */
button = e;
return true;
return e;
}
}
}
button = EDIT_BUTTON_INVALID;
return false;
return EDIT_BUTTON_INVALID;
}
/* Given a DeviceInput that was just depressed, return an active edit function. */
bool ScreenEdit::MenuButtonToEditButton( MenuButton MenuI, EditButton &button ) const
EditButton ScreenEdit::MenuButtonToEditButton( MenuButton MenuI ) const
{
const MapEditButtonToMenuButton *pCurrentMap = GetCurrentMenuButtonMap();
@@ -365,15 +359,12 @@ bool ScreenEdit::MenuButtonToEditButton( MenuButton MenuI, EditButton &button )
if( pCurrentMap->button[e][slot] == MenuI )
{
/* The button maps to this function. */
button = e;
return true;
return e;
}
}
}
button = EDIT_BUTTON_INVALID;
return false;
return EDIT_BUTTON_INVALID;
}
/* If DeviceI was just pressed, return true if button is triggered. (More than one
@@ -1084,9 +1075,9 @@ void ScreenEdit::Input( const InputEventPlus &input )
if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
return;
EditButton EditB;
if( !DeviceToEdit( input.DeviceI, EditB ) )
MenuButtonToEditButton( input.MenuI, EditB );
EditButton EditB = DeviceToEdit( input.DeviceI );
if( EditB == EDIT_BUTTON_INVALID )
EditB = MenuButtonToEditButton( input.MenuI );
if( EditB == EDIT_BUTTON_REMOVE_NOTE )
stepmania/src/ScreenEdit.h
+2 -2
View File
@@ -456,8 +456,8 @@ public:
};
void InitEditMappings();
bool DeviceToEdit( const DeviceInput &DeviceI, EditButton &button ) const;
bool MenuButtonToEditButton( MenuButton MenuI, EditButton &button ) const;
EditButton DeviceToEdit( const DeviceInput &DeviceI ) const;
EditButton MenuButtonToEditButton( MenuButton MenuI ) const;
bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const;
bool EditPressed( EditButton button, const DeviceInput &DeviceI );
bool EditIsBeingPressed( EditButton button ) const;