h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 15:53:51 +08:00
Code Issues Releases Wiki Activity

Actually return beat length and not BPM

Browse Source
This commit is contained in:
smoogipoo 2021-01-15 14:32:06 +09:00
parent c6e9a6cd5a
commit 24e991a5ef
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Beatmap.cs
View File

@ -83,7 +83,7 @@ namespace osu.Game.Beatmaps
} }
} }
return 60000 / maxDurationBeatLength; return maxDurationBeatLength;
} }
IBeatmap IBeatmap.Clone() => Clone(); IBeatmap IBeatmap.Clone() => Clone();

2
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps
// TODO: this should be done in a better place once we actually need to dynamically update it. // TODO: this should be done in a better place once we actually need to dynamically update it.
beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0; beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
beatmap.BeatmapInfo.Length = calculateLength(beatmap); beatmap.BeatmapInfo.Length = calculateLength(beatmap);
beatmap.BeatmapInfo.BPM = beatmap.GetMostCommonBeatLength(); beatmap.BeatmapInfo.BPM = 60000 / beatmap.GetMostCommonBeatLength();
beatmapInfos.Add(beatmap.BeatmapInfo); beatmapInfos.Add(beatmap.BeatmapInfo);
} }

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -391,7 +391,7 @@ namespace osu.Game.Screens.Select
if (Precision.AlmostEquals(bpmMin, bpmMax)) if (Precision.AlmostEquals(bpmMin, bpmMax))
return $"{bpmMin:0}"; return $"{bpmMin:0}";
return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.GetMostCommonBeatLength():0})"; return $"{bpmMin:0}-{bpmMax:0} (mostly {60000 / beatmap.GetMostCommonBeatLength():0})";
} }
private OsuSpriteText[] getMapper(BeatmapMetadata metadata) private OsuSpriteText[] getMapper(BeatmapMetadata metadata)