From e988bba855c016d5735bff76cbf79e3abcb93fca Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 20:03:54 -0400 Subject: [PATCH] sm124futures: Enhanced editor stuff in progress. Cycle between the different types of Tap Notes. Hold/Roll heads do not count on this. Obviously still being worked on, but the code compiles at this point. --- Themes/_fallback/Languages/en.ini | 1 + src/ScreenEdit.cpp | 4 ++++ src/ScreenEdit.h | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 984de88fc7..64d49a73a8 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1925,6 +1925,7 @@ Insert beat and shift down=Insert beat and shift down Shift BPM changes and stops down one beat=Shift BPM changes and stops down one beat Delete beat and shift up=Delete beat and shift up Shift BPM changes and stops up one beat=Shift BPM changes and stops up one beat +Cycle between tap notes=Cycle between tap notes Lay mine=Lay mine Lay lift=Lay lift Add to/remove from right half=Add to/remove from right half diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 5fba445970..7e50cc8faf 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -269,6 +269,9 @@ void ScreenEdit::InitEditMappings() // m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_TAP_ATTACK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT); m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL); + + m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_LEFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cn); + m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_RIGHT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cm); m_EditMappingsDeviceInput.button [EDIT_BUTTON_SCROLL_SPEED_UP][0] = DeviceInput(DEVICE_KEYBOARD, KEY_UP); m_EditMappingsDeviceInput.hold[EDIT_BUTTON_SCROLL_SPEED_UP][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); @@ -4035,6 +4038,7 @@ static const EditHelpLine g_EditHelpLines[] = EditHelpLine( "Shift BPM changes and stops down one beat", EDIT_BUTTON_INSERT_SHIFT_PAUSES ), EditHelpLine( "Delete beat and shift up", EDIT_BUTTON_DELETE ), EditHelpLine( "Shift BPM changes and stops up one beat", EDIT_BUTTON_DELETE_SHIFT_PAUSES ), + EditHelpLine( "Cycle between tap notes", EDIT_BUTTON_CYCLE_TAP_LEFT, EDIT_BUTTON_CYCLE_TAP_RIGHT ), EditHelpLine( "Lay mine", EDIT_BUTTON_LAY_MINE_OR_ROLL ), EditHelpLine( "Lay lift", EDIT_BUTTON_LAY_LIFT ), EditHelpLine( "Add to/remove from right half", EDIT_BUTTON_RIGHT_SIDE ), diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index f32e6940ac..d68d2dafd4 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -54,6 +54,10 @@ enum EditButton EDIT_BUTTON_LAY_TAP_ATTACK, EDIT_BUTTON_LAY_LIFT, EDIT_BUTTON_REMOVE_NOTE, + + // These are modifiers to change the present tap note. + EDIT_BUTTON_CYCLE_TAP_LEFT, + EDIT_BUTTON_CYCLE_TAP_RIGHT, EDIT_BUTTON_SCROLL_UP_LINE, EDIT_BUTTON_SCROLL_UP_PAGE,