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

Fix even more test regressions.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-27 20:39:04 +09:00
parent a22216d0b0
commit afdb95f4d5
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,8 @@ namespace osu.Game.Beatmaps
public List<HitObject> HitObjects { get; set; } public List<HitObject> HitObjects { get; set; }
public List<ControlPoint> ControlPoints { get; set; } public List<ControlPoint> ControlPoints { get; set; }
public List<Color4> ComboColors { get; set; } public List<Color4> ComboColors { get; set; }
public double BPMMaximum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).First().BeatLength; public double BPMMaximum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
public double BPMMinimum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).First().BeatLength; public double BPMMinimum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
public double BPMMode => BPMAt(ControlPoints.Where(c => c.BeatLength != 0).GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).First().First().Time); public double BPMMode => BPMAt(ControlPoints.Where(c => c.BeatLength != 0).GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).First().First().Time);
public double BPMAt(double time) public double BPMAt(double time)

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

@ -63,6 +63,7 @@ namespace osu.Game.Screens.Select
BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo; BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo;
BeatmapInfo beatmapInfo = beatmap.BeatmapInfo; BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
BeatmapMetadata metadata = beatmap.BeatmapInfo?.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
List<InfoLabel> labels = new List<InfoLabel>(); List<InfoLabel> labels = new List<InfoLabel>();
@ -133,7 +134,7 @@ namespace osu.Game.Screens.Select
new OsuSpriteText new OsuSpriteText
{ {
Font = @"Exo2.0-MediumItalic", Font = @"Exo2.0-MediumItalic",
Text = beatmapSetInfo.Metadata.Artist + " -- " + beatmapSetInfo.Metadata.Title, Text = metadata.Artist + " -- " + metadata.Title,
TextSize = 28, TextSize = 28,
Shadow = true, Shadow = true,
}, },
@ -161,7 +162,7 @@ namespace osu.Game.Screens.Select
new OsuSpriteText new OsuSpriteText
{ {
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Text = beatmapSetInfo.Metadata.Author, Text = metadata.Author,
TextSize = 15, TextSize = 15,
Shadow = true, Shadow = true,
}, },