Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics

This commit is contained in:
Dean Herbert
2019-02-04 12:15:53 +09:00
1398 changed files with 6660 additions and 4013 deletions

View File

@ -1,5 +1,5 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.IO;
@ -117,12 +117,12 @@ namespace osu.Game.Scoring.Legacy
}
}
calculateAccuracy(score.ScoreInfo);
CalculateAccuracy(score.ScoreInfo);
return score;
}
private void calculateAccuracy(ScoreInfo score)
protected void CalculateAccuracy(ScoreInfo score)
{
score.Statistics.TryGetValue(HitResult.Miss, out int countMiss);
score.Statistics.TryGetValue(HitResult.Meh, out int count50);