From 241437c819e89db8b6e06d45405d6d8fef30b689 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Jul 2018 17:08:25 +0900
Subject: [PATCH] Remove unnecessary counting change logic

---
 osu.Game.Tests/Visual/TestCaseKeyCounter.cs   | 1 -
 osu.Game/Screens/Play/HUDOverlay.cs           | 1 -
 osu.Game/Screens/Play/KeyCounter.cs           | 2 +-
 osu.Game/Screens/Play/KeyCounterCollection.cs | 3 +--
 osu.Game/Screens/Play/Player.cs               | 3 ---
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseKeyCounter.cs b/osu.Game.Tests/Visual/TestCaseKeyCounter.cs
index a20f67e336..b98875cd6a 100644
--- a/osu.Game.Tests/Visual/TestCaseKeyCounter.cs
+++ b/osu.Game.Tests/Visual/TestCaseKeyCounter.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Tests.Visual
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
-                IsCounting = true,
                 Children = new KeyCounter[]
                 {
                     new KeyCounterKeyboard(Key.Z),
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f920b20649..4f3fe15211 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -195,7 +195,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
         {
-            IsCounting = true,
             FadeTime = 50,
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index 2a0587133b..2c31e61114 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
         private Container textLayer;
         private SpriteText countSpriteText;
 
-        public bool IsCounting { get; set; }
+        public bool IsCounting { get; set; } = true;
         private int countPresses;
         public int CountPresses
         {
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterCollection.cs
index 114ea83ba6..721d925d63 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterCollection.cs
@@ -53,8 +53,7 @@ namespace osu.Game.Screens.Play
             configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
-        //further: change default values here and in KeyCounter if needed, instead of passing them in every constructor
-        private bool isCounting;
+        private bool isCounting = true;
         public bool IsCounting
         {
             get { return isCounting; }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 427519bff8..f28ddb09a2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -224,9 +224,6 @@ namespace osu.Game.Screens.Play
 
             RulesetContainer.IsPaused.BindTo(pauseContainer.IsPaused);
 
-            // schedule to ensure we count any key presses from the current frame (which may affect gameplay).
-            RulesetContainer.IsPaused.ValueChanged += paused => Schedule(() => hudOverlay.KeyCounter.IsCounting = !paused);
-
             if (ShowStoryboard)
                 initializeStoryboard(false);