From 2af9bf1423c924d532e1f505ca31401b3ffd8460 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Sat, 22 Apr 2017 21:33:11 +0900 Subject: [PATCH] Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects. --- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 10 ++--- .../Legacy/Catch/{Hit.cs => ConvertHit.cs} | 2 +- ...ectParser.cs => ConvertHitObjectParser.cs} | 8 ++-- .../Catch/{Slider.cs => ConvertSlider.cs} | 2 +- .../Catch/{Spinner.cs => ConvertSpinner.cs} | 2 +- ...ectParser.cs => ConvertHitObjectParser.cs} | 18 ++++----- ...tObjectType.cs => ConvertHitObjectType.cs} | 2 +- .../Legacy/{Hold.cs => ConvertHold.cs} | 2 +- .../{LegacySlider.cs => ConvertSlider.cs} | 2 +- .../Legacy/Mania/{Hit.cs => ConvertHit.cs} | 2 +- ...ectParser.cs => ConvertHitObjectParser.cs} | 8 ++-- .../Mania/{Slider.cs => ConvertSlider.cs} | 2 +- .../Mania/{Spinner.cs => ConvertSpinner.cs} | 2 +- .../Legacy/Osu/{Hit.cs => ConvertHit.cs} | 2 +- ...ectParser.cs => ConvertHitObjectParser.cs} | 8 ++-- .../Osu/{Slider.cs => ConvertSlider.cs} | 2 +- .../Osu/{Spinner.cs => ConvertSpinner.cs} | 2 +- .../Legacy/Taiko/{Hit.cs => ConvertHit.cs} | 2 +- ...ectParser.cs => ConvertHitObjectParser.cs} | 8 ++-- .../Taiko/{Slider.cs => ConvertSlider.cs} | 2 +- .../Taiko/{Spinner.cs => ConvertSpinner.cs} | 2 +- osu.Game/osu.Game.csproj | 40 +++++++++---------- 22 files changed, 65 insertions(+), 65 deletions(-) rename osu.Game/Rulesets/Objects/Legacy/Catch/{Hit.cs => ConvertHit.cs} (82%) rename osu.Game/Rulesets/Objects/Legacy/Catch/{HitObjectParser.cs => ConvertHitObjectParser.cs} (85%) rename osu.Game/Rulesets/Objects/Legacy/Catch/{Slider.cs => ConvertSlider.cs} (80%) rename osu.Game/Rulesets/Objects/Legacy/Catch/{Spinner.cs => ConvertSpinner.cs} (84%) rename osu.Game/Rulesets/Objects/Legacy/{HitObjectParser.cs => ConvertHitObjectParser.cs} (92%) rename osu.Game/Rulesets/Objects/Legacy/{HitObjectType.cs => ConvertHitObjectType.cs} (87%) rename osu.Game/Rulesets/Objects/Legacy/{Hold.cs => ConvertHold.cs} (83%) rename osu.Game/Rulesets/Objects/Legacy/{LegacySlider.cs => ConvertSlider.cs} (90%) rename osu.Game/Rulesets/Objects/Legacy/Mania/{Hit.cs => ConvertHit.cs} (82%) rename osu.Game/Rulesets/Objects/Legacy/Mania/{HitObjectParser.cs => ConvertHitObjectParser.cs} (85%) rename osu.Game/Rulesets/Objects/Legacy/Mania/{Slider.cs => ConvertSlider.cs} (80%) rename osu.Game/Rulesets/Objects/Legacy/Mania/{Spinner.cs => ConvertSpinner.cs} (83%) rename osu.Game/Rulesets/Objects/Legacy/Osu/{Hit.cs => ConvertHit.cs} (84%) rename osu.Game/Rulesets/Objects/Legacy/Osu/{HitObjectParser.cs => ConvertHitObjectParser.cs} (85%) rename osu.Game/Rulesets/Objects/Legacy/Osu/{Slider.cs => ConvertSlider.cs} (82%) rename osu.Game/Rulesets/Objects/Legacy/Osu/{Spinner.cs => ConvertSpinner.cs} (85%) rename osu.Game/Rulesets/Objects/Legacy/Taiko/{Hit.cs => ConvertHit.cs} (84%) rename osu.Game/Rulesets/Objects/Legacy/Taiko/{HitObjectParser.cs => ConvertHitObjectParser.cs} (84%) rename osu.Game/Rulesets/Objects/Legacy/Taiko/{Slider.cs => ConvertSlider.cs} (81%) rename osu.Game/Rulesets/Objects/Legacy/Taiko/{Spinner.cs => ConvertSpinner.cs} (84%) diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index 74a5be698e..95213417ed 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps.Formats // TODO: Not sure how far back to go, or differences between versions } - private HitObjectParser parser; + private ConvertHitObjectParser parser; private LegacySampleBank defaultSampleBank; private int defaultSampleVolume = 100; @@ -90,16 +90,16 @@ namespace osu.Game.Beatmaps.Formats switch (beatmap.BeatmapInfo.RulesetID) { case 0: - parser = new Rulesets.Objects.Legacy.Osu.HitObjectParser(); + parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(); break; case 1: - parser = new Rulesets.Objects.Legacy.Taiko.HitObjectParser(); + parser = new Rulesets.Objects.Legacy.Taiko.ConvertHitObjectParser(); break; case 2: - parser = new Rulesets.Objects.Legacy.Catch.HitObjectParser(); + parser = new Rulesets.Objects.Legacy.Catch.ConvertHitObjectParser(); break; case 3: - parser = new Rulesets.Objects.Legacy.Mania.HitObjectParser(); + parser = new Rulesets.Objects.Legacy.Mania.ConvertHitObjectParser(); break; } break; diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/Hit.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs similarity index 82% rename from osu.Game/Rulesets/Objects/Legacy/Catch/Hit.cs rename to osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs index 41dacd1265..30c10c302a 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Catch/Hit.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch /// /// Legacy osu!catch Hit-type, used for parsing Beatmaps. /// - internal sealed class Hit : HitObject, IHasCombo, IHasXPosition + internal sealed class ConvertHit : HitObject, IHasCombo, IHasXPosition { public float X { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/HitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs similarity index 85% rename from osu.Game/Rulesets/Objects/Legacy/Catch/HitObjectParser.cs rename to osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs index 6575db99e7..1550772f8e 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Catch/HitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs @@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch /// /// A HitObjectParser to parse legacy osu!catch Beatmaps. /// - internal class HitObjectParser : Legacy.HitObjectParser + internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser { protected override HitObject CreateHit(Vector2 position, bool newCombo) { - return new Hit + return new ConvertHit { X = position.X, NewCombo = newCombo, @@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch protected override HitObject CreateSlider(Vector2 position, bool newCombo, List controlPoints, double length, CurveType curveType, int repeatCount, List> repeatSamples) { - return new Slider + return new ConvertSlider { X = position.X, NewCombo = newCombo, @@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch protected override HitObject CreateSpinner(Vector2 position, double endTime) { - return new Spinner + return new ConvertSpinner { EndTime = endTime }; diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/Slider.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs similarity index 80% rename from osu.Game/Rulesets/Objects/Legacy/Catch/Slider.cs rename to osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs index 1e1ae0c213..781fe8f7fa 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Catch/Slider.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch /// /// Legacy osu!catch Slider-type, used for parsing Beatmaps. /// - internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo + internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasXPosition, IHasCombo { public float X { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/Spinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs similarity index 84% rename from osu.Game/Rulesets/Objects/Legacy/Catch/Spinner.cs rename to osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs index 7690f42e76..0652737b12 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Catch/Spinner.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch /// /// Legacy osu!catch Spinner-type, used for parsing Beatmaps. /// - internal sealed class Spinner : HitObject, IHasEndTime + internal sealed class ConvertSpinner : HitObject, IHasEndTime { public double EndTime { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/HitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs similarity index 92% rename from osu.Game/Rulesets/Objects/Legacy/HitObjectParser.cs rename to osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs index 4caaf24da5..5b6de3bff7 100644 --- a/osu.Game/Rulesets/Objects/Legacy/HitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs @@ -14,28 +14,28 @@ namespace osu.Game.Rulesets.Objects.Legacy /// /// A HitObjectParser to parse legacy Beatmaps. /// - internal abstract class HitObjectParser : Objects.HitObjectParser + internal abstract class ConvertHitObjectParser : Objects.HitObjectParser { public override HitObject Parse(string text) { string[] split = text.Split(','); - HitObjectType type = (HitObjectType)int.Parse(split[3]) & ~HitObjectType.ColourHax; - bool combo = type.HasFlag(HitObjectType.NewCombo); - type &= ~HitObjectType.NewCombo; + ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]) & ~ConvertHitObjectType.ColourHax; + bool combo = type.HasFlag(ConvertHitObjectType.NewCombo); + type &= ~ConvertHitObjectType.NewCombo; var soundType = (LegacySoundType)int.Parse(split[4]); var bankInfo = new SampleBankInfo(); HitObject result; - if ((type & HitObjectType.Circle) > 0) + if ((type & ConvertHitObjectType.Circle) > 0) { result = CreateHit(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo); if (split.Length > 5) readCustomSampleBanks(split[5], bankInfo); } - else if ((type & HitObjectType.Slider) > 0) + else if ((type & ConvertHitObjectType.Slider) > 0) { CurveType curveType = CurveType.Catmull; double length = 0; @@ -129,21 +129,21 @@ namespace osu.Game.Rulesets.Objects.Legacy result = CreateSlider(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, points, length, curveType, repeatCount, nodeSamples); } - else if ((type & HitObjectType.Spinner) > 0) + else if ((type & ConvertHitObjectType.Spinner) > 0) { result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture)); if (split.Length > 6) readCustomSampleBanks(split[6], bankInfo); } - else if ((type & HitObjectType.Hold) > 0) + else if ((type & ConvertHitObjectType.Hold) > 0) { // Note: Hold is generated by BMS converts // Todo: Apparently end time is determined by samples?? // Shouldn't need implementation until mania - result = new Hold + result = new ConvertHold { Position = new Vector2(int.Parse(split[0]), int.Parse(split[1])), NewCombo = combo diff --git a/osu.Game/Rulesets/Objects/Legacy/HitObjectType.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectType.cs similarity index 87% rename from osu.Game/Rulesets/Objects/Legacy/HitObjectType.cs rename to osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectType.cs index 9111e6bd12..09f005e666 100644 --- a/osu.Game/Rulesets/Objects/Legacy/HitObjectType.cs +++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectType.cs @@ -6,7 +6,7 @@ using System; namespace osu.Game.Rulesets.Objects.Legacy { [Flags] - public enum HitObjectType + internal enum ConvertHitObjectType { Circle = 1 << 0, Slider = 1 << 1, diff --git a/osu.Game/Rulesets/Objects/Legacy/Hold.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHold.cs similarity index 83% rename from osu.Game/Rulesets/Objects/Legacy/Hold.cs rename to osu.Game/Rulesets/Objects/Legacy/ConvertHold.cs index a0a741e8e7..d79f6e324e 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Hold.cs +++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHold.cs @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy /// /// Legacy Hold-type, used for parsing "specials" in beatmaps. /// - internal sealed class Hold : HitObject, IHasPosition, IHasCombo, IHasHold + internal sealed class ConvertHold : HitObject, IHasPosition, IHasCombo, IHasHold { public Vector2 Position { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacySlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs similarity index 90% rename from osu.Game/Rulesets/Objects/Legacy/LegacySlider.cs rename to osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs index 96a671fcef..06391a9906 100644 --- a/osu.Game/Rulesets/Objects/Legacy/LegacySlider.cs +++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs @@ -9,7 +9,7 @@ using osu.Game.Audio; namespace osu.Game.Rulesets.Objects.Legacy { - internal class LegacySlider : HitObject, IHasCurve + internal abstract class ConvertSlider : HitObject, IHasCurve { public List ControlPoints { get; set; } public CurveType CurveType { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/Hit.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs similarity index 82% rename from osu.Game/Rulesets/Objects/Legacy/Mania/Hit.cs rename to osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs index 8e407fcf92..2a65b853b7 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Mania/Hit.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania /// /// Legacy osu!mania Hit-type, used for parsing Beatmaps. /// - internal sealed class Hit : HitObject, IHasXPosition, IHasCombo + internal sealed class ConvertHit : HitObject, IHasXPosition, IHasCombo { public float X { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/HitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs similarity index 85% rename from osu.Game/Rulesets/Objects/Legacy/Mania/HitObjectParser.cs rename to osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs index 0b2e245413..b21857797f 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Mania/HitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs @@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania /// /// A HitObjectParser to parse legacy osu!mania Beatmaps. /// - internal class HitObjectParser : Legacy.HitObjectParser + internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser { protected override HitObject CreateHit(Vector2 position, bool newCombo) { - return new Hit + return new ConvertHit { X = position.X, NewCombo = newCombo, @@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania protected override HitObject CreateSlider(Vector2 position, bool newCombo, List controlPoints, double length, CurveType curveType, int repeatCount, List> repeatSamples) { - return new Slider + return new ConvertSlider { X = position.X, NewCombo = newCombo, @@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania protected override HitObject CreateSpinner(Vector2 position, double endTime) { - return new Spinner + return new ConvertSpinner { X = position.X, EndTime = endTime diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/Slider.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs similarity index 80% rename from osu.Game/Rulesets/Objects/Legacy/Mania/Slider.cs rename to osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs index e92685ee7a..adc0c064bc 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Mania/Slider.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania /// /// Legacy osu!mania Slider-type, used for parsing Beatmaps. /// - internal sealed class Slider : LegacySlider, IHasXPosition, IHasCombo + internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasXPosition, IHasCombo { public float X { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/Spinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs similarity index 83% rename from osu.Game/Rulesets/Objects/Legacy/Mania/Spinner.cs rename to osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs index 3937eb003e..f72c5b9894 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Mania/Spinner.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania /// /// Legacy osu!mania Spinner-type, used for parsing Beatmaps. /// - internal sealed class Spinner : HitObject, IHasEndTime, IHasXPosition + internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasXPosition { public double EndTime { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/Hit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs similarity index 84% rename from osu.Game/Rulesets/Objects/Legacy/Osu/Hit.cs rename to osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs index a30ba9b265..0c1000965c 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Osu/Hit.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu /// /// Legacy osu! Hit-type, used for parsing Beatmaps. /// - internal sealed class Hit : HitObject, IHasPosition, IHasCombo + internal sealed class ConvertHit : HitObject, IHasPosition, IHasCombo { public Vector2 Position { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/HitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs similarity index 85% rename from osu.Game/Rulesets/Objects/Legacy/Osu/HitObjectParser.cs rename to osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs index 61db0f6c25..e45a161f52 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Osu/HitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs @@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu /// /// A HitObjectParser to parse legacy osu! Beatmaps. /// - internal class HitObjectParser : Legacy.HitObjectParser + internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser { protected override HitObject CreateHit(Vector2 position, bool newCombo) { - return new Hit + return new ConvertHit { Position = position, NewCombo = newCombo, @@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu protected override HitObject CreateSlider(Vector2 position, bool newCombo, List controlPoints, double length, CurveType curveType, int repeatCount, List> repeatSamples) { - return new Slider + return new ConvertSlider { Position = position, NewCombo = newCombo, @@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu protected override HitObject CreateSpinner(Vector2 position, double endTime) { - return new Spinner + return new ConvertSpinner { Position = position, EndTime = endTime diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/Slider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs similarity index 82% rename from osu.Game/Rulesets/Objects/Legacy/Osu/Slider.cs rename to osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs index 3ac28f2fd2..75a6d80560 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Osu/Slider.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu /// /// Legacy osu! Slider-type, used for parsing Beatmaps. /// - internal sealed class Slider : LegacySlider, IHasPosition, IHasCombo + internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo { public Vector2 Position { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/Spinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs similarity index 85% rename from osu.Game/Rulesets/Objects/Legacy/Osu/Spinner.cs rename to osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs index ad3f9637a7..2b2dbe0765 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Osu/Spinner.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu /// /// Legacy osu! Spinner-type, used for parsing Beatmaps. /// - internal sealed class Spinner : HitObject, IHasEndTime, IHasPosition + internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasPosition { public double EndTime { get; set; } diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/Hit.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs similarity index 84% rename from osu.Game/Rulesets/Objects/Legacy/Taiko/Hit.cs rename to osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs index 0a9a8ac64c..7088cc480b 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Taiko/Hit.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko /// /// Legacy osu!taiko Hit-type, used for parsing Beatmaps. /// - internal sealed class Hit : HitObject, IHasCombo + internal sealed class ConvertHit : HitObject, IHasCombo { public bool NewCombo { get; set; } } diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/HitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs similarity index 84% rename from osu.Game/Rulesets/Objects/Legacy/Taiko/HitObjectParser.cs rename to osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs index 52d0a5e2d4..2de2f217d1 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Taiko/HitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs @@ -11,11 +11,11 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko /// /// A HitObjectParser to parse legacy osu!taiko Beatmaps. /// - internal class HitObjectParser : Legacy.HitObjectParser + internal class ConvertHitObjectParser : Legacy.ConvertHitObjectParser { protected override HitObject CreateHit(Vector2 position, bool newCombo) { - return new Hit + return new ConvertHit { NewCombo = newCombo, }; @@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko protected override HitObject CreateSlider(Vector2 position, bool newCombo, List controlPoints, double length, CurveType curveType, int repeatCount, List> repeatSamples) { - return new Slider + return new ConvertSlider { NewCombo = newCombo, ControlPoints = controlPoints, @@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko protected override HitObject CreateSpinner(Vector2 position, double endTime) { - return new Spinner + return new ConvertSpinner { EndTime = endTime }; diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/Slider.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs similarity index 81% rename from osu.Game/Rulesets/Objects/Legacy/Taiko/Slider.cs rename to osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs index 3666369f74..b472423a1d 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Taiko/Slider.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko /// /// Legacy osu!taiko Slider-type, used for parsing Beatmaps. /// - internal sealed class Slider : LegacySlider, IHasCombo + internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasCombo { public bool NewCombo { get; set; } } diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/Spinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs similarity index 84% rename from osu.Game/Rulesets/Objects/Legacy/Taiko/Spinner.cs rename to osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs index 1b296b9533..abef667d91 100644 --- a/osu.Game/Rulesets/Objects/Legacy/Taiko/Spinner.cs +++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs @@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko /// /// Legacy osu!taiko Spinner-type, used for parsing Beatmaps. /// - internal sealed class Spinner : HitObject, IHasEndTime + internal sealed class ConvertSpinner : HitObject, IHasEndTime { public double EndTime { get; set; } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index be50f85c0c..60456602c2 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -109,20 +109,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -135,11 +135,11 @@ - - - - - + + + + + @@ -152,7 +152,7 @@ - +