diff --git a/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs b/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs index d8b0349ae2..48ab4c47eb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseInGameOverlays.cs @@ -26,8 +26,6 @@ namespace osu.Desktop.VisualTests.Tests OnResume = () => Logger.Log(@"Resume"), OnRetry = () => Logger.Log(@"Retry"), OnQuit = () => Logger.Log(@"Quit"), - Title = @"paused", - Description = @"you're not going to do what i think you're going to do, are ya?", }; failOverlay = new FailOverlay @@ -35,8 +33,6 @@ namespace osu.Desktop.VisualTests.Tests Depth = -1, OnRetry = () => Logger.Log(@"Retry"), OnQuit = () => Logger.Log(@"Quit"), - Title = @"failed", - Description = @"you're dead, try again?", }; Add(pauseOverlay); diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs index 8636537416..6ae0292cda 100644 --- a/osu.Game/Screens/Play/FailOverlay.cs +++ b/osu.Game/Screens/Play/FailOverlay.cs @@ -28,5 +28,11 @@ namespace osu.Game.Screens.Play AddButton(@"Retry", colours.YellowDark, OnRetry); AddButton(@"Quit to Main Menu", new Color4(170, 27, 39, 255), OnQuit); } + + public FailOverlay() + { + title = @"failed"; + description = @"you're dead, try again?"; + } } } diff --git a/osu.Game/Screens/Play/InGameOverlay.cs b/osu.Game/Screens/Play/InGameOverlay.cs index 6081044467..6a8d7a21ca 100644 --- a/osu.Game/Screens/Play/InGameOverlay.cs +++ b/osu.Game/Screens/Play/InGameOverlay.cs @@ -27,20 +27,8 @@ namespace osu.Game.Screens.Play public Action OnRetry; public Action OnQuit; - private string title; - private string description; - - public string Title - { - get { return title; } - set { title = value; } - } - - public string Description - { - get { return description; } - set { description = value; } - } + protected string title; + protected string description; private FillFlowContainer buttons; @@ -143,7 +131,7 @@ namespace osu.Game.Screens.Play { new OsuSpriteText { - Text = Title, + Text = title, Font = @"Exo2.0-Medium", Spacing = new Vector2(5, 0), Origin = Anchor.TopCentre, @@ -155,7 +143,7 @@ namespace osu.Game.Screens.Play }, new OsuSpriteText { - Text = Description, + Text = description, Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, Shadow = true, diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs index f359fc3a78..27c3b25d02 100644 --- a/osu.Game/Screens/Play/PauseOverlay.cs +++ b/osu.Game/Screens/Play/PauseOverlay.cs @@ -32,6 +32,12 @@ namespace osu.Game.Screens.Play AddButton(@"Retry", colours.YellowDark, OnRetry); AddButton(@"Quit to Main Menu", new Color4(170, 27, 39, 255), OnQuit); } + + public PauseOverlay() + { + title = @"paused"; + description = @"you're not going to do what i think you're going to do, are ya?"; + } } } \ No newline at end of file diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index fcf95d3925..cfe2b248ff 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -131,8 +131,6 @@ namespace osu.Game.Screens.Play }, OnRetry = Restart, OnQuit = Exit, - Title = @"paused", - Description = @"you're not going to do what i think you're going to do, are ya?", }; failOverlay = new FailOverlay @@ -140,8 +138,6 @@ namespace osu.Game.Screens.Play Depth = -1, OnRetry = Restart, OnQuit = Exit, - Title = @"failed", - Description = @"you're dead, try again?", };