sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-23 14:37:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make restart public rather than reimplementing

Browse Source
This commit is contained in:
Dean Herbert 2019-03-20 19:45:04 +09:00
parent cda5bc28c8
commit 01f795b046
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
View File

@ -231,12 +231,7 @@ namespace osu.Game.Tests.Visual
{ {
performFullSetup(); performFullSetup();
AddStep("Move mouse to Visual Settings", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos)); AddStep("Move mouse to Visual Settings", () => InputManager.MoveMouseTo(playerLoader.VisualSettingsPos));
AddStep("Resume PlayerLoader", () => AddStep("Resume PlayerLoader", () => player.Restart());
{
player.ValidForResume = false;
player.RestartRequested?.Invoke();
player.Exit();
});
waitForDim(); waitForDim();
AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied()); AddAssert("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos)); AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));

8
osu.Game/Screens/Play/Player.cs
View File

@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play
PausableGameplayContainer = new PausableGameplayContainer PausableGameplayContainer = new PausableGameplayContainer
{ {
Retries = RestartCount, Retries = RestartCount,
OnRetry = restart, OnRetry = Restart,
OnQuit = performUserRequestedExit, OnQuit = performUserRequestedExit,
Start = gameplayClockContainer.Start, Start = gameplayClockContainer.Start,
Stop = gameplayClockContainer.Stop, Stop = gameplayClockContainer.Stop,
@ -154,7 +154,7 @@ namespace osu.Game.Screens.Play
}, },
failOverlay = new FailOverlay failOverlay = new FailOverlay
{ {
OnRetry = restart, OnRetry = Restart,
OnQuit = performUserRequestedExit, OnQuit = performUserRequestedExit,
}, },
new HotkeyRetryOverlay new HotkeyRetryOverlay
@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
if (!this.IsCurrentScreen()) return; if (!this.IsCurrentScreen()) return;
fadeOut(true); fadeOut(true);
restart(); Restart();
}, },
} }
}; };
@ -235,7 +235,7 @@ namespace osu.Game.Screens.Play
this.Exit(); this.Exit();
} }
private void restart() public void Restart()
{ {
if (!this.IsCurrentScreen()) return; if (!this.IsCurrentScreen()) return;