don't wipe out meter > 10
This commit is contained in:
@@ -133,12 +133,16 @@ void Notes::TidyUpData()
|
|||||||
}
|
}
|
||||||
// Meter is overflowing (invalid), but some files (especially maniac/smaniac steps) are purposefully set higher than 10.
|
// 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.
|
// 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)
|
if( GetDifficulty() == DIFFICULTY_HARD || GetDifficulty() == DIFFICULTY_CHALLENGE)
|
||||||
SetMeter(10);
|
SetMeter(10);
|
||||||
else
|
else
|
||||||
SetMeter(0);
|
SetMeter(0);
|
||||||
}
|
} */
|
||||||
if( GetMeter() < 1) // meter is invalid
|
if( GetMeter() < 1) // meter is invalid
|
||||||
{
|
{
|
||||||
// guess meter from difficulty class
|
// guess meter from difficulty class
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, Player
|
|||||||
// Stats_DoublesCount = true;
|
// Stats_DoublesCount = true;
|
||||||
|
|
||||||
int Meter = notes? notes->GetMeter() : 5;
|
int Meter = notes? notes->GetMeter() : 5;
|
||||||
|
Meter = min(Meter, 10);
|
||||||
|
|
||||||
/* Hold notes count as two tap notes. However, hold notes already count
|
/* Hold notes count as two tap notes. However, hold notes already count
|
||||||
* as 1 in GetNumTapNotes(), so only add 1*GetNumHoldNotes, not 2. */
|
* as 1 in GetNumTapNotes(), so only add 1*GetNumHoldNotes, not 2. */
|
||||||
|
|||||||
Reference in New Issue
Block a user