actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
John Reactor
2011-08-04 19:42:26 +02:00
parent 75522c4f6d 249f671138
commit 2a7e6dd0d0
5 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+4
View File
@@ -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
Themes/_fallback/Languages/en.ini
+2 -2
View File
@@ -1,4 +1,4 @@
[Common]
[Common]
WindowTitle=StepMania
StepMania=StepMania
@@ -2175,7 +2175,7 @@ Oriya=Oriya
Punjabi=Punjabi
Polish=Polski
Pashto=پښتو
Portuguese=português
Portuguese=Português
Quechua=Quechua
Rhaeto-Romance=Rhaeto-Romance
Kirundi=Kirundi
src/NoteTypes.h
-7
View File
@@ -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);
src/PaneDisplay.cpp
+3 -3
View File
@@ -124,9 +124,9 @@ void PaneDisplay::SetContent( PaneCategory c )
const Profile *pProfile = PROFILEMAN->IsPersistentProfile(m_PlayerNumber) ? PROFILEMAN->GetProfile(m_PlayerNumber) : NULL;
bool bIsPlayerEdit = pSteps && pSteps->IsAPlayerEdit();
// Note: in SM3.9, all values would get set to a "?" if the current
// selection (pSong/pCourse, in this case) is invalid. In sm-ssc, we use
// the falback values (everything is blank).
// Note: In SM3.9, all values would get set to a "?" if the current
// selection (pSong/pCourse, in this case) is invalid.
// We use fallback values (everything is blank).
// TODO: add a theme option to use a similar behavior. -aj
if(GAMESTATE->IsCourseMode() && !pTrail)
src/ScreenEdit.cpp
-9
View File
@@ -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() )