From 429fb10c70c11410b8211c86cb319fa7831cbfd3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 9 Feb 2003 01:30:06 +0000 Subject: [PATCH] don't wipe out meter > 10 --- stepmania/src/Notes.cpp | 8 ++++++-- stepmania/src/ScoreKeeperMAX2.cpp | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp index 1131e5f3c5..bda24256b6 100644 --- a/stepmania/src/Notes.cpp +++ b/stepmania/src/Notes.cpp @@ -133,12 +133,16 @@ void Notes::TidyUpData() } // Meter is overflowing (invalid), but some files (especially maniac/smaniac steps) are purposefully set higher than 10. // See: BMR's Gravity; we probably should keep those as difficult as we can represent. - if( GetMeter() >10 ) { + /* Why? If the data file says a meter of 72, we should keep it as 72; if + * individual bits of code (eg. scoring, feet) have maximums, they should + * enforce it internally. Doing it here will make us lose the difficulty + * completely if the song is edited and written. -glenn */ +/* if( GetMeter() >10 ) { if( GetDifficulty() == DIFFICULTY_HARD || GetDifficulty() == DIFFICULTY_CHALLENGE) SetMeter(10); else SetMeter(0); - } + } */ if( GetMeter() < 1) // meter is invalid { // guess meter from difficulty class diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp index 73a0d79181..93ab2be50f 100644 --- a/stepmania/src/ScoreKeeperMAX2.cpp +++ b/stepmania/src/ScoreKeeperMAX2.cpp @@ -8,6 +8,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, Player // Stats_DoublesCount = true; int Meter = notes? notes->GetMeter() : 5; + Meter = min(Meter, 10); /* Hold notes count as two tap notes. However, hold notes already count * as 1 in GetNumTapNotes(), so only add 1*GetNumHoldNotes, not 2. */