From 06e8da57f8bc9ac3e42546f5e0574f9bb18d0d81 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 18 Dec 2005 23:56:14 +0000 Subject: [PATCH] convert_beat_to_pause -> convert_to_pause (operates on the selection, not a beat) --- stepmania/src/ScreenEdit.cpp | 9 ++++----- stepmania/src/ScreenEdit.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 61b7b920f0..f5e51e351e 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -477,7 +477,7 @@ static MenuDef g_AreaMenu( MenuRowDef( ScreenEdit::delete_and_shift, "Delete beat and shift up", true, EditMode_Practice, true, 0, NULL ), MenuRowDef( ScreenEdit::shift_pauses_forward, "Shift pauses and BPM changes down",true, EditMode_Full, true, 0, NULL ), MenuRowDef( ScreenEdit::shift_pauses_backward, "Shift pauses and BPM changes up", true, EditMode_Full, true, 0, NULL ), - MenuRowDef( ScreenEdit::convert_beat_to_pause, "Convert beats to pause", true, EditMode_Full, true, 0, NULL ), + MenuRowDef( ScreenEdit::convert_to_pause, "Convert selection to pause", true, EditMode_Full, true, 0, NULL ), MenuRowDef( ScreenEdit::convert_pause_to_beat, "Convert pause to beats", true, EditMode_Full, true, 0, NULL ), MenuRowDef( ScreenEdit::undo, "Undo", true, EditMode_Practice, true, 0, NULL ) ); @@ -1307,7 +1307,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) g_AreaMenu.rows[tempo].bEnabled = bAreaSelected; g_AreaMenu.rows[play].bEnabled = bAreaSelected; g_AreaMenu.rows[record].bEnabled = bAreaSelected; - g_AreaMenu.rows[convert_beat_to_pause].bEnabled = bAreaSelected; + g_AreaMenu.rows[convert_to_pause].bEnabled = bAreaSelected; g_AreaMenu.rows[undo].bEnabled = m_bHasUndo; EditMiniMenu( m_pAreaMenu, SM_BackFromAreaMenu, SM_None, &g_AreaMenu ); } @@ -2726,7 +2726,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns case delete_and_shift: case shift_pauses_forward: case shift_pauses_backward: - case convert_beat_to_pause: + case convert_to_pause: case convert_pause_to_beat: bSaveUndo = true; break; @@ -2973,8 +2973,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns case shift_pauses_backward: m_pSong->m_Timing.DeleteRows( BeatToNoteRow(GAMESTATE->m_fSongBeat), BeatToNoteRow(1) ); break; - // MD 11/02/03 - Converting selected region to a pause of the same length. - case convert_beat_to_pause: + case convert_to_pause: { ASSERT( m_NoteFieldEdit.m_iBeginMarker!=-1 && m_NoteFieldEdit.m_iEndMarker!=-1 ); float fMarkerStart = m_pSong->m_Timing.GetElapsedTimeFromBeat( NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker) ); diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index d605875c70..83f048a974 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -293,7 +293,7 @@ public: delete_and_shift, shift_pauses_forward, shift_pauses_backward, - convert_beat_to_pause, + convert_to_pause, convert_pause_to_beat, undo, NUM_AREA_MENU_CHOICES