From c7183f92f79efe7855fb4b4defacb9224659e3e3 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 19 Apr 2021 19:53:55 +0900 Subject: [PATCH] Rename Restart() -> Reset() --- osu.Game/Screens/Play/GameplayClockContainer.cs | 4 ++-- osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 4 ++-- osu.Game/Screens/Play/Player.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs index 642ede5f1c..ee65384bc9 100644 --- a/osu.Game/Screens/Play/GameplayClockContainer.cs +++ b/osu.Game/Screens/Play/GameplayClockContainer.cs @@ -82,9 +82,9 @@ namespace osu.Game.Screens.Play public virtual void Stop() => IsPaused.Value = true; /// - /// Restarts gameplay. + /// Resets this and the source to an initial state ready for gameplay. /// - public virtual void Restart() + public virtual void Reset() { AdjustableSource.Seek(0); AdjustableSource.Stop(); diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs index db0aa23001..5ea50cbdc7 100644 --- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs +++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs @@ -123,10 +123,10 @@ namespace osu.Game.Screens.Play userOffsetClock.ProcessFrame(); } - public override void Restart() + public override void Reset() { updateRate(); - base.Restart(); + base.Reset(); } /// diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 841f906b05..27a4fcc291 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -811,7 +811,7 @@ namespace osu.Game.Screens.Play if (GameplayClockContainer.GameplayClock.IsRunning) throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running"); - GameplayClockContainer.Restart(); + GameplayClockContainer.Reset(); } public override void OnSuspending(IScreen next)