h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:52:55 +08:00
Code Issues Releases Wiki Activity

Fix rebase regressions

Browse Source
This commit is contained in:
Dean Herbert 2019-05-31 15:58:46 +09:00
parent e03a664970
commit a2fbcb2bd3
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Gameplay/TestCaseLeadIn.cs
View File

@ -15,7 +15,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual.Gameplay namespace osu.Game.Tests.Visual.Gameplay
{ {
public class TestCaseLeadIn : RateAdjustedBeatmapTestCase public class TestCaseLeadIn : RateAdjustedBeatmapTestScene
{ {
private Ruleset ruleset; private Ruleset ruleset;
@ -52,15 +52,16 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
Beatmap.Value = new TestWorkingBeatmap(beatmap, Clock); Beatmap.Value = new TestWorkingBeatmap(beatmap, Clock);
LoadScreen(player = new LeadInPlayer LoadScreen(player = new LeadInPlayer());
{
AllowPause = false,
AllowResults = false,
});
} }
private class LeadInPlayer : Player private class LeadInPlayer : Player
{ {
public LeadInPlayer()
: base(false, false)
{
}
public double? FirstFrameClockTime; public double? FirstFrameClockTime;
public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer; public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
@ -72,6 +73,7 @@ namespace osu.Game.Tests.Visual.Gameplay
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildren();
if (!FirstFrameClockTime.HasValue) if (!FirstFrameClockTime.HasValue)
{ {
FirstFrameClockTime = GameplayClockContainer.GameplayClock.CurrentTime; FirstFrameClockTime = GameplayClockContainer.GameplayClock.CurrentTime;

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

@ -26,10 +26,6 @@ namespace osu.Game.Screens.Play
private readonly WorkingBeatmap beatmap; private readonly WorkingBeatmap beatmap;
private readonly IReadOnlyList<Mod> mods; private readonly IReadOnlyList<Mod> mods;
private readonly bool allowLeadIn;
private readonly double gameplayStartTime;
/// <summary> /// <summary>
/// The original source (usually a <see cref="WorkingBeatmap"/>'s track). /// The original source (usually a <see cref="WorkingBeatmap"/>'s track).
/// </summary> /// </summary>
@ -91,8 +87,6 @@ namespace osu.Game.Screens.Play
GameplayClock.IsPaused.BindTo(IsPaused); GameplayClock.IsPaused.BindTo(IsPaused);
} }
private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {