From c6eaaf658e7fae1c1e32f3d26624ec33ac0d0602 Mon Sep 17 00:00:00 2001
From: Aergwyn <aergwyn@t-online.de>
Date: Tue, 12 Dec 2017 13:24:18 +0100
Subject: [PATCH] fix BeatmapInfoWedge not counting Circles/Sliders correctly

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs                    | 10 +++++-----
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs      |  2 +-
 osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs     |  2 +-
 osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs  |  2 +-
 osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index bb5700976d..d67f7f6948 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -5,7 +5,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.OsuDifficulty;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
@@ -18,6 +17,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Legacy.Osu;
 
 namespace osu.Game.Rulesets.Osu
 {
@@ -37,14 +37,14 @@ namespace osu.Game.Rulesets.Osu
         {
             new BeatmapStatistic
             {
-                Name = @"Circle count",
-                Content = beatmap.Beatmap.HitObjects.Count(h => h is HitCircle).ToString(),
+                Name = @"Circle Count",
+                Content = beatmap.Beatmap.HitObjects.Count(h => h is ConvertHit).ToString(),
                 Icon = FontAwesome.fa_dot_circle_o
             },
             new BeatmapStatistic
             {
-                Name = @"Slider count",
-                Content = beatmap.Beatmap.HitObjects.Count(h => h is Slider).ToString(),
+                Name = @"Slider Count",
+                Content = beatmap.Beatmap.HitObjects.Count(h => h is ConvertSlider).ToString(),
                 Icon = FontAwesome.fa_circle_o
             }
         };
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 479cacc52b..9527f50802 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -11,7 +11,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : HitObject, IHasCurve
+    public abstract class ConvertSlider : HitObject, IHasCurve
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
index 0c1000965c..04c67ff1e4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : HitObject, IHasPosition, IHasCombo
+    public sealed class ConvertHit : HitObject, IHasPosition, IHasCombo
     {
         public Vector2 Position { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index 75a6d80560..3c15eaf14b 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Slider-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
+    public sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
     {
         public Vector2 Position { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index 2b2dbe0765..eff0f1a2cb 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasPosition
+    public sealed class ConvertSpinner : HitObject, IHasEndTime, IHasPosition
     {
         public double EndTime { get; set; }