sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into no-more-difficulty-control-points-info

Browse Source
This commit is contained in:
smoogipoo
2021-10-08 18:41:17 +09:00
parent 46bafb6252 5b89293fa3
commit bc37cb6f43
334 changed files with 5475 additions and 2428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Beatmaps.Formats
this.beatmap.HitObjects = this.beatmap.HitObjects.OrderBy(h => h.StartTime).ToList();
foreach (var hitObject in this.beatmap.HitObjects)
hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.BeatmapInfo.BaseDifficulty);
hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.Difficulty);
}
protected override bool ShouldSkipLine(string line) => base.ShouldSkipLine(line) || line.StartsWith(' ') || line.StartsWith('_');
@ -276,7 +276,7 @@ namespace osu.Game.Beatmaps.Formats
{
var pair = SplitKeyVal(line);
var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
var difficulty = beatmap.Difficulty;
switch (pair.Key)
{
@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps.Formats
if (obj != null)
{
obj.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty);
obj.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
beatmap.HitObjects.Add(obj);
}