From a7b58e07a203c286dd1863bc2ef79bbd77037e0b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 13 May 2011 09:20:42 -0400 Subject: [PATCH] [splittiming] Broadcast message on failure. --- Themes/_fallback/Languages/en.ini | 1 + src/ScreenEdit.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index a2014d3f75..03cef7dd16 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1257,6 +1257,7 @@ This change creates more than %d notes in a measure.=This change creates more th This change creates notes past the end of the music and is not allowed.=This change creates notes past the end of the music and is not allowed. This will destroy all unsaved changes.=This will destroy all unsaved changes. Undo=Undo +You must be in Step Timing Mode to edit the notes.=You must be in Step Timing Mode to edit the notes. Current beat=Current beat Current second=Current second diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 0b8f28af26..025decb52b 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -1276,9 +1276,10 @@ static int FindAttackAtTime( const AttackArray& attacks, float fStartTime ) return -1; } +static LocalizedString TAP_NOTE_SONG_TIMING ( "ScreenEdit", "You must be in Step Timing Mode to edit the notes." ); static LocalizedString SWITCHED_TO ( "ScreenEdit", "Switched to" ); static LocalizedString NO_BACKGROUNDS_AVAILABLE ( "ScreenEdit", "No backgrounds available" ); -static ThemeMetric INVERT_SCROLL_BUTTONS ( "ScreenEdit", "InvertScrollSpeedButtons" ); +static ThemeMetric INVERT_SCROLL_BUTTONS ( "ScreenEdit", "InvertScrollSpeedButtons" ); void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) { @@ -1309,8 +1310,9 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) if( !GAMESTATE->m_bIsEditorStepTiming ) { - // TODO: broadcast a message...? - break; // Only allow steps to be hit in Step Timing. + // Only allow steps to be hit in Step Timing. + SCREENMAN->SystemMessage( TAP_NOTE_SONG_TIMING ); + break; } int iCol = EditB - EDIT_BUTTON_COLUMN_0;