diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
index 011f5e07a3..774d1e00d3 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.MathUtils;
using osu.Framework.Screens.Testing;
using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Osu.UI;
using osu.Game.Modes.UI;
namespace osu.Desktop.VisualTests.Tests
@@ -90,7 +89,7 @@ namespace osu.Desktop.VisualTests.Tests
AddButton(@"miss...", delegate
{
- comboCounter.Roll();
+ comboCounter.Current.Value = 0;
denominator++;
accuracyCounter.SetFraction(numerator, denominator);
});
diff --git a/osu.Game/Modes/UI/ComboCounter.cs b/osu.Game/Modes/UI/ComboCounter.cs
index a276da3e5a..75d22ed0ad 100644
--- a/osu.Game/Modes/UI/ComboCounter.cs
+++ b/osu.Game/Modes/UI/ComboCounter.cs
@@ -71,10 +71,7 @@ namespace osu.Game.Modes.UI
private void comboChanged(object sender, System.EventArgs e)
{
- if (Current.Value == 0)
- Roll();
- else
- updateCount(Current);
+ updateCount(Current.Value == 0);
}
protected override void LoadComplete()
@@ -129,24 +126,7 @@ namespace osu.Game.Modes.UI
///
public void StopRolling()
{
- updateCount(Current);
- }
-
- ///
- /// Animates roll-up/roll-back to an specific value.
- ///
- /// Target value.
- public virtual void Roll(long newValue = 0)
- {
- updateCount(newValue, true);
- }
-
- ///
- /// Resets count to default value.
- ///
- public virtual void ResetCount()
- {
- updateCount(0);
+ updateCount(false);
}
protected virtual string FormatCount(long count)
@@ -186,10 +166,10 @@ namespace osu.Game.Modes.UI
OnDisplayedCountChange(newValue);
}
- private void updateCount(long value, bool rolling = false)
+ private void updateCount(bool rolling)
{
long prev = previousValue;
- previousValue = Current.Value;
+ previousValue = Current;
if (!IsLoaded)
return;
diff --git a/osu.Game/Modes/UI/HUDOverlay.cs b/osu.Game/Modes/UI/HUDOverlay.cs
index 9dbccffdbd..0baea91bce 100644
--- a/osu.Game/Modes/UI/HUDOverlay.cs
+++ b/osu.Game/Modes/UI/HUDOverlay.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Modes.UI
public virtual void OnMiss(HitObject h)
{
- ComboCounter?.Roll();
+ ComboCounter.Current.Value = 0;
AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f);
}
diff --git a/osu.Game/Modes/UI/HealthDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs
index b920dcd68a..3efda1cd4e 100644
--- a/osu.Game/Modes/UI/HealthDisplay.cs
+++ b/osu.Game/Modes/UI/HealthDisplay.cs
@@ -16,9 +16,9 @@ namespace osu.Game.Modes.UI
protected HealthDisplay()
{
- Current.ValueChanged += (s, e) => SetHP((float)Current);
+ Current.ValueChanged += (s, e) => SetHealth((float)Current);
}
- protected abstract void SetHP(float value);
+ protected abstract void SetHealth(float value);
}
}
diff --git a/osu.Game/Modes/UI/StandardHealthDisplay.cs b/osu.Game/Modes/UI/StandardHealthDisplay.cs
index 11b0bcd0c0..ca4a1410ab 100644
--- a/osu.Game/Modes/UI/StandardHealthDisplay.cs
+++ b/osu.Game/Modes/UI/StandardHealthDisplay.cs
@@ -55,6 +55,6 @@ namespace osu.Game.Modes.UI
};
}
- protected override void SetHP(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
+ protected override void SetHealth(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
}
}