mirror of
https://github.com/ppy/osu
synced 2025-01-31 10:22:02 +00:00
Merge branch 'master' into dashboard-overlay-new
This commit is contained in:
commit
8d3f6ee463
@ -187,27 +187,13 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
|
|
||||||
writer.WriteLine("[HitObjects]");
|
writer.WriteLine("[HitObjects]");
|
||||||
|
|
||||||
|
// TODO: implement other legacy rulesets
|
||||||
switch (beatmap.BeatmapInfo.RulesetID)
|
switch (beatmap.BeatmapInfo.RulesetID)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
foreach (var h in beatmap.HitObjects)
|
foreach (var h in beatmap.HitObjects)
|
||||||
handleOsuHitObject(writer, h);
|
handleOsuHitObject(writer, h);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
|
||||||
foreach (var h in beatmap.HitObjects)
|
|
||||||
handleTaikoHitObject(writer, h);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2:
|
|
||||||
foreach (var h in beatmap.HitObjects)
|
|
||||||
handleCatchHitObject(writer, h);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 3:
|
|
||||||
foreach (var h in beatmap.HitObjects)
|
|
||||||
handleManiaHitObject(writer, h);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -328,12 +314,6 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleTaikoHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
|
|
||||||
|
|
||||||
private void handleCatchHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
|
|
||||||
|
|
||||||
private void handleManiaHitObject(TextWriter writer, HitObject hitObject) => throw new NotImplementedException();
|
|
||||||
|
|
||||||
private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
|
private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
|
||||||
{
|
{
|
||||||
LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
|
LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
|
||||||
|
Loading…
Reference in New Issue
Block a user