From d51c0d486e980c60bf47aa90ffa538651477e46f Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 4 Aug 2011 12:30:35 -0500 Subject: [PATCH] [NoteTypes, ScreenEdit] Removed artificial MAX_NOTES_PER_MEASURE limit. --- Docs/Changelog_sm5.txt | 4 ++++ src/NoteTypes.h | 7 ------- src/ScreenEdit.cpp | 9 --------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 995287f8f5..f01dfec96c 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 Preview 3 | 20110??? -------------------------------------------------------------------------------- +2011/08/04 +---------- +* [NoteTypes, ScreenEdit] Removed artificial MAX_NOTES_PER_MEASURE limit. [AJ] + 2011/08/02 ---------- * [NotesSSC] Only write timing/attack tags for the step if there is a diff --git a/src/NoteTypes.h b/src/NoteTypes.h index 7339ec1292..5f430f3c72 100644 --- a/src/NoteTypes.h +++ b/src/NoteTypes.h @@ -257,13 +257,6 @@ const int MAX_NOTE_TRACKS = 16; * Is this a recommended course of action? -Wolfman2000 */ const int ROWS_PER_BEAT = 48; -/** - * @brief Enforce a maximum number of notes per measure in the step editor. - * - * TODO: See if there is a way to de-hard-code this number. - */ -const int MAX_NOTES_PER_MEASURE = 50; - /** @brief The max number of rows allowed for a Steps pattern. */ const int MAX_NOTE_ROW = (1<<30); diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 0676400bfa..aa325b842f 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -4992,7 +4992,6 @@ void ScreenEdit::ClearUndo() } static LocalizedString CREATES_MORE_THAN_NOTES ( "ScreenEdit", "This change creates more than %d notes in a measure." ); -static LocalizedString MORE_THAN_NOTES ( "ScreenEdit", "More than %d notes per measure is not allowed. This change has been reverted." ); static LocalizedString CREATES_NOTES_PAST_END ( "ScreenEdit", "This change creates notes past the end of the music and is not allowed." ); static LocalizedString CHANGE_REVERTED ( "ScreenEdit", "The change has been reverted." ); void ScreenEdit::CheckNumberOfNotesAndUndo() @@ -5008,14 +5007,6 @@ void ScreenEdit::CheckNumberOfNotesAndUndo() int iNumNotesThisMeasure = 0; FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_NoteDataEdit, r, row, row+rowsPerMeasure ) iNumNotesThisMeasure += m_NoteDataEdit.GetNumTapNonEmptyTracks( r ); - if( iNumNotesThisMeasure > MAX_NOTES_PER_MEASURE ) - { - Undo(); - m_bHasUndo = false; - RString sError = ssprintf( CREATES_MORE_THAN_NOTES.GetValue() + "\n\n" + MORE_THAN_NOTES.GetValue(), MAX_NOTES_PER_MEASURE, MAX_NOTES_PER_MEASURE ); - ScreenPrompt::Prompt( SM_None, sError ); - return; - } } if( GAMESTATE->m_pCurSteps[0]->IsAnEdit() )