From ea4eb6b2043e6cc9cb63c20a2c3d8461f276d983 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Fri, 13 Dec 2019 21:29:10 +0900 Subject: [PATCH] CI cleanups --- .../Beatmaps/Formats/LegacyBeatmapEncoder.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs index f367ab3817..e16411f343 100644 --- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs +++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs @@ -225,9 +225,9 @@ namespace osu.Game.Beatmaps.Formats LegacyHitObjectType hitObjectType = (LegacyHitObjectType)(comboData.ComboOffset << 4); if (comboData.NewCombo) hitObjectType |= LegacyHitObjectType.NewCombo; - if (hitObject is IHasCurve _) + if (hitObject is IHasCurve) hitObjectType |= LegacyHitObjectType.Slider; - else if (hitObject is IHasEndTime _) + else if (hitObject is IHasEndTime) hitObjectType |= LegacyHitObjectType.Spinner | LegacyHitObjectType.NewCombo; else hitObjectType |= LegacyHitObjectType.Circle; @@ -237,10 +237,9 @@ namespace osu.Game.Beatmaps.Formats writer.Write(FormattableString.Invariant($"{hitObject.StartTime},")); writer.Write(FormattableString.Invariant($"{(int)hitObjectType},")); - if (hitObject is IHasCurve _) - writer.Write(FormattableString.Invariant($"0,")); // A sound type of "none" is written since it's stored per-node - else - writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},")); + writer.Write(hitObject is IHasCurve + ? FormattableString.Invariant($"0,") + : FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},")); if (hitObject is IHasCurve curveData) { @@ -307,10 +306,9 @@ namespace osu.Game.Beatmaps.Formats else if (hitObject is IHasEndTime endTimeData) writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},")); - if (hitObject is IHasCurve _) - writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true)); // A bank of "none" is written since it's stored per-node - else - writer.Write(getSampleBank(hitObject.Samples)); + writer.Write(hitObject is IHasCurve + ? getSampleBank(hitObject.Samples, zeroBanks: true) + : getSampleBank(hitObject.Samples)); writer.Write(Environment.NewLine); }