sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up constructor logic overlap with gameplayStartTime

Browse Source
This commit is contained in:
Dean Herbert
2022-03-17 23:39:45 +09:00
parent a4a0241800
commit e3ab5de8cd
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,13 +42,13 @@ namespace osu.Game.Screens.Play
public event Action OnSeek;
/// <summary>
/// The time from which gameplay should start. Will be seeked to on calling <see cref="Reset"/>.
/// The time from which the clock should start. Will be seeked to on calling <see cref="Reset"/>.
/// </summary>
/// <remarks>
/// If not set, a value of zero will be used.
/// Importantly, the value will be inferred from the current ruleset in <see cref="MasterGameplayClockContainer"/> unless specified.
/// </remarks>
protected double? GameplayStartTime { get; private set; }
protected double? StartTime { get; set; }
/// <summary>
/// Creates a new <see cref="GameplayClockContainer"/>.
@ -120,10 +120,10 @@ namespace osu.Game.Screens.Play
public void Reset(bool startClock = false, double? gameplayStartTime = null)
{
if (gameplayStartTime != null)
GameplayStartTime = gameplayStartTime;
StartTime = gameplayStartTime;
ensureSourceClockSet();
Seek(GameplayStartTime ?? 0);
Seek(StartTime ?? 0);
// Manually stop the source in order to not affect the IsPaused state.
AdjustableSource.Stop();