add mapping for undo

This commit is contained in:
Chris Danford
2005-05-17 07:24:25 +00:00
parent 4e6d716027
commit 647d194847
2 changed files with 20 additions and 3 deletions
+18 -3
View File
@@ -193,6 +193,8 @@ void ScreenEdit::InitEditMappings()
g_EditMappings.button[EDIT_BUTTON_ADJUST_FINE][0] = DeviceInput(DEVICE_KEYBOARD, KEY_RALT); g_EditMappings.button[EDIT_BUTTON_ADJUST_FINE][0] = DeviceInput(DEVICE_KEYBOARD, KEY_RALT);
g_EditMappings.button[EDIT_BUTTON_ADJUST_FINE][1] = DeviceInput(DEVICE_KEYBOARD, KEY_LALT); g_EditMappings.button[EDIT_BUTTON_ADJUST_FINE][1] = DeviceInput(DEVICE_KEYBOARD, KEY_LALT);
g_EditMappings.button[EDIT_BUTTON_UNDO][1] = DeviceInput(DEVICE_KEYBOARD, KEY_Cu);
g_PlayMappings.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC); g_PlayMappings.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC);
g_PlayMappings.button[EDIT_BUTTON_TOGGLE_ASSIST_TICK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F4); g_PlayMappings.button[EDIT_BUTTON_TOGGLE_ASSIST_TICK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F4);
g_PlayMappings.button[EDIT_BUTTON_TOGGLE_AUTOPLAY][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F8); g_PlayMappings.button[EDIT_BUTTON_TOGGLE_AUTOPLAY][0] = DeviceInput(DEVICE_KEYBOARD, KEY_F8);
@@ -1370,6 +1372,10 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
HandleAreaMenuChoice( shift_pauses_backward ); HandleAreaMenuChoice( shift_pauses_backward );
SCREENMAN->PlayInvalidSound(); SCREENMAN->PlayInvalidSound();
break; break;
case EDIT_BUTTON_UNDO:
Undo();
break;
} }
} }
@@ -2687,9 +2693,18 @@ void ScreenEdit::SaveUndo()
void ScreenEdit::Undo() void ScreenEdit::Undo()
{ {
m_NoteDataEdit.CopyAll( m_Undo ); if( m_bHasUndo )
m_bHasUndo = false; {
m_Undo.ClearAll(); m_NoteDataEdit.CopyAll( m_Undo );
m_bHasUndo = false;
m_Undo.ClearAll();
SCREENMAN->SystemMessage( "Undo" );
}
else
{
SCREENMAN->SystemMessage( "Can't undo - no undo data." );
SCREENMAN->PlayInvalidSound();
}
} }
void ScreenEdit::CheckNumberOfNotesAndUndo() void ScreenEdit::CheckNumberOfNotesAndUndo()
+2
View File
@@ -95,6 +95,8 @@ enum EditButton
/* This modifies offset, BPM, and stop segment changes. */ /* This modifies offset, BPM, and stop segment changes. */
EDIT_BUTTON_ADJUST_FINE, EDIT_BUTTON_ADJUST_FINE,
EDIT_BUTTON_UNDO,
NUM_EDIT_BUTTONS, // leave this at the end NUM_EDIT_BUTTONS, // leave this at the end
EDIT_BUTTON_INVALID EDIT_BUTTON_INVALID
}; };