sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reorganise call order of Start / Reset to make more sense

Browse Source
This commit is contained in:
Dean Herbert
2022-08-19 01:40:12 +09:00
parent 15d49b0357
commit 3eb1cda6aa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -89,22 +89,22 @@ namespace osu.Game.Screens.Play
}
/// <summary>
/// Starts gameplay.
/// Starts gameplay and marks un-paused state.
/// </summary>
public virtual void Start()
{
ensureSourceClockSet();
isPaused.Value = false;
// the clock may be stopped via internal means (ie. not via `IsPaused`).
if (!GameplayClock.IsRunning)
{
// Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
// This accounts for the clock source potentially taking time to enter a completely stopped state
Seek(GameplayClock.CurrentTime);
GameplayClock.Start();
}
isPaused.Value = false;
}
/// <summary>
@ -121,7 +121,7 @@ namespace osu.Game.Screens.Play
}
/// <summary>
/// Stops gameplay.
/// Stops gameplay and marks paused state.
/// </summary>
public void Stop() => isPaused.Value = true;
@ -134,11 +134,11 @@ namespace osu.Game.Screens.Play
// Manually stop the source in order to not affect the IsPaused state.
GameplayClock.Stop();
if (!IsPaused.Value || startClock)
Start();
ensureSourceClockSet();
Seek(StartTime);
if (!IsPaused.Value || startClock)
Start();
}
/// <summary>