From a18367454d0791641138d3653b96d4cdaf73648b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Apr 2017 15:34:52 +0900
Subject: [PATCH] InGameOverlay -> MenuOverlay.

---
 osu.Game/Screens/Play/FailOverlay.cs          |  2 +-
 .../Play/{InGameOverlay.cs => MenuOverlay.cs} |  4 +-
 osu.Game/Screens/Play/PauseOverlay.cs         |  2 +-
 osu.Game/Screens/Play/Player.cs               | 39 ++++++++-----------
 osu.Game/osu.Game.csproj                      |  2 +-
 5 files changed, 22 insertions(+), 27 deletions(-)
 rename osu.Game/Screens/Play/{InGameOverlay.cs => MenuOverlay.cs} (96%)

diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index 566f8d9cc1..7a32e19338 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -10,7 +10,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Play
 {
-    public class FailOverlay : InGameOverlay
+    public class FailOverlay : MenuOverlay
     {
 
         public override string Header => "failed";
diff --git a/osu.Game/Screens/Play/InGameOverlay.cs b/osu.Game/Screens/Play/MenuOverlay.cs
similarity index 96%
rename from osu.Game/Screens/Play/InGameOverlay.cs
rename to osu.Game/Screens/Play/MenuOverlay.cs
index d35fe28f3e..ede49065a7 100644
--- a/osu.Game/Screens/Play/InGameOverlay.cs
+++ b/osu.Game/Screens/Play/MenuOverlay.cs
@@ -16,7 +16,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class InGameOverlay : OverlayContainer
+    public abstract class MenuOverlay : OverlayContainer
     {
         private const int transition_duration = 200;
         private const int button_height = 70;
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Play
             Retries = 0;
         }
 
-        protected InGameOverlay()
+        protected MenuOverlay()
         {
             AlwaysReceiveInput = true;
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 1a5ecbe92f..f9706d263e 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -11,7 +11,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Play
 {
-    public class PauseOverlay : InGameOverlay
+    public class PauseOverlay : MenuOverlay
     {
         public Action OnResume;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a854e05150..5868f86215 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -119,26 +119,6 @@ namespace osu.Game.Screens.Play
             hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
             hudOverlay.BindProcessor(scoreProcessor);
 
-            pauseOverlay = new PauseOverlay
-            {
-                Depth = -1,
-                OnResume = delegate
-                {
-                    Delay(400);
-                    Schedule(Resume);
-                },
-                OnRetry = Restart,
-                OnQuit = Exit,
-            };
-
-            failOverlay = new FailOverlay
-            {
-                Depth = -1,
-                OnRetry = Restart,
-                OnQuit = Exit,
-            };
-
-
             hudOverlay.BindHitRenderer(HitRenderer);
 
             //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
@@ -163,8 +143,23 @@ namespace osu.Game.Screens.Play
                     }
                 },
                 hudOverlay,
-                pauseOverlay,
-                failOverlay
+                pauseOverlay = new PauseOverlay
+                {
+                    Depth = -1,
+                    OnResume = delegate
+                    {
+                        Delay(400);
+                        Schedule(Resume);
+                    },
+                    OnRetry = Restart,
+                    OnQuit = Exit,
+                },
+                failOverlay = new FailOverlay
+                {
+                    Depth = -1,
+                    OnRetry = Restart,
+                    OnQuit = Exit,
+                }
             };
         }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6113aa3d14..ec0a4b4c39 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -199,7 +199,7 @@
     <Compile Include="Screens\Multiplayer\Match.cs" />
     <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
     <Compile Include="Screens\Play\FailOverlay.cs" />
-    <Compile Include="Screens\Play\InGameOverlay.cs" />
+    <Compile Include="Screens\Play\MenuOverlay.cs" />
     <Compile Include="Screens\Play\KeyConversionInputManager.cs" />
     <Compile Include="Screens\Play\PauseOverlay.cs" />
     <Compile Include="Screens\Play\Pause\PauseButton.cs" />