mirror of https://github.com/ppy/osu
Fix rebase regressions
This commit is contained in:
parent
e03a664970
commit
a2fbcb2bd3
|
@ -15,7 +15,7 @@
|
|||
|
||||
namespace osu.Game.Tests.Visual.Gameplay
|
||||
{
|
||||
public class TestCaseLeadIn : RateAdjustedBeatmapTestCase
|
||||
public class TestCaseLeadIn : RateAdjustedBeatmapTestScene
|
||||
{
|
||||
private Ruleset ruleset;
|
||||
|
||||
|
@ -52,15 +52,16 @@ private void loadPlayerWithBeatmap(IBeatmap beatmap)
|
|||
{
|
||||
Beatmap.Value = new TestWorkingBeatmap(beatmap, Clock);
|
||||
|
||||
LoadScreen(player = new LeadInPlayer
|
||||
{
|
||||
AllowPause = false,
|
||||
AllowResults = false,
|
||||
});
|
||||
LoadScreen(player = new LeadInPlayer());
|
||||
}
|
||||
|
||||
private class LeadInPlayer : Player
|
||||
{
|
||||
public LeadInPlayer()
|
||||
: base(false, false)
|
||||
{
|
||||
}
|
||||
|
||||
public double? FirstFrameClockTime;
|
||||
|
||||
public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
|
||||
|
@ -72,6 +73,7 @@ private class LeadInPlayer : Player
|
|||
protected override void UpdateAfterChildren()
|
||||
{
|
||||
base.UpdateAfterChildren();
|
||||
|
||||
if (!FirstFrameClockTime.HasValue)
|
||||
{
|
||||
FirstFrameClockTime = GameplayClockContainer.GameplayClock.CurrentTime;
|
||||
|
|
|
@ -26,10 +26,6 @@ public class GameplayClockContainer : Container
|
|||
private readonly WorkingBeatmap beatmap;
|
||||
private readonly IReadOnlyList<Mod> mods;
|
||||
|
||||
private readonly bool allowLeadIn;
|
||||
|
||||
private readonly double gameplayStartTime;
|
||||
|
||||
/// <summary>
|
||||
/// The original source (usually a <see cref="WorkingBeatmap"/>'s track).
|
||||
/// </summary>
|
||||
|
@ -91,8 +87,6 @@ public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, d
|
|||
GameplayClock.IsPaused.BindTo(IsPaused);
|
||||
}
|
||||
|
||||
private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuConfigManager config)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue