From b99e0a0439cab0fa7c0831018605f53631f9865a Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Sat, 30 Dec 2017 14:15:42 +0900 Subject: [PATCH 1/2] Fix DrawableHitCircle accepting a base OsuHitObject parameter Fixes #1778. --- osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs index a973d2b580..736bc5267d 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables private readonly NumberPiece number; private readonly GlowPiece glow; - public DrawableHitCircle(OsuHitObject h) : base(h) + public DrawableHitCircle(HitCircle h) : base(h) { Origin = Anchor.Centre; @@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables }, number = new NumberPiece { - Text = h is Spinner ? "S" : (HitObject.ComboIndex + 1).ToString(), + Text = (HitObject.ComboIndex + 1).ToString(), }, ring = new RingPiece(), flash = new FlashPiece(), From 0bd1b75d0b4910b14c69dfbd6c17c7f892091fff Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 30 Dec 2017 15:38:10 +0900 Subject: [PATCH 2/2] Fix test case --- osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs index e669dd234a..cdce19ad21 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs @@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Tests { private readonly bool auto; - public TestDrawableHitCircle(OsuHitObject h, bool auto) : base(h) + public TestDrawableHitCircle(HitCircle h, bool auto) : base(h) { this.auto = auto; }