diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 76ec35d87d..e0a497cf24 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -88,7 +88,7 @@ public void TestSamplePlaybackAtZero()
[Test]
public void TestSampleHasLifetimeEndWithInitialClockTime()
{
- GameplayClockContainer gameplayContainer = null;
+ MasterGameplayClockContainer gameplayContainer = null;
DrawableStoryboardSample sample = null;
AddStep("create container", () =>
@@ -96,8 +96,11 @@ public void TestSampleHasLifetimeEndWithInitialClockTime()
var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
working.LoadTrack();
- Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true)
+ const double start_time = 1000;
+
+ Add(gameplayContainer = new MasterGameplayClockContainer(working, start_time)
{
+ StartTime = start_time,
IsPaused = { Value = true },
Child = new FrameStabilityContainer
{
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 653a35417e..703b526e8c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -464,16 +464,16 @@ private void waitForCatchup(int userId)
private class TestMultiSpectatorScreen : MultiSpectatorScreen
{
- private readonly double? gameplayStartTime;
+ private readonly double? startTime;
- public TestMultiSpectatorScreen(Room room, MultiplayerRoomUser[] users, double? gameplayStartTime = null)
+ public TestMultiSpectatorScreen(Room room, MultiplayerRoomUser[] users, double? startTime = null)
: base(room, users)
{
- this.gameplayStartTime = gameplayStartTime;
+ this.startTime = startTime;
}
protected override MasterGameplayClockContainer CreateMasterGameplayClockContainer(WorkingBeatmap beatmap)
- => new MasterGameplayClockContainer(beatmap, gameplayStartTime ?? 0, true);
+ => new MasterGameplayClockContainer(beatmap, 0) { StartTime = startTime ?? 0 };
}
}
}
diff --git a/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs b/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs
index f49603c754..d9e19df350 100644
--- a/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs
+++ b/osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs
@@ -25,7 +25,7 @@ public EditorPlayer(Editor editor)
}
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
- => new MasterGameplayClockContainer(beatmap, editorState.Time, true);
+ => new MasterGameplayClockContainer(beatmap, gameplayStart) { StartTime = editorState.Time };
protected override void LoadComplete()
{
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 61f31db435..c5a5c14070 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -71,16 +71,11 @@ public class MasterGameplayClockContainer : GameplayClockContainer
///
/// The beatmap to be used for time and metadata references.
/// The latest time which should be used when introducing gameplay. Will be used when skipping forward.
- /// Whether to start from the provided latest start time rather than zero.
- public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime, bool startFromSkipTarget = false)
+ public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
: base(beatmap.Track)
{
this.beatmap = beatmap;
-
this.skipTargetTime = skipTargetTime;
-
- if (startFromSkipTarget)
- StartTime = skipTargetTime;
}
protected override void LoadComplete()