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

Remove AllowLeadIn flag

Browse Source
This commit is contained in:
Dean Herbert
2019-03-26 16:34:26 +09:00
parent a63bcff5cc
commit 83863d35c3
7 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs
View File

@ -333,7 +333,6 @@ namespace osu.Game.Rulesets.Osu.Tests
var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } }) var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } })
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false AllowResults = false
}; };

1
osu.Game.Tests/Visual/Gameplay/TestCaseAutoplay.cs
View File

@ -18,7 +18,6 @@ namespace osu.Game.Tests.Visual.Gameplay
return new ScoreAccessiblePlayer return new ScoreAccessiblePlayer
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false, AllowResults = false,
}; };
} }

2
osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs
View File

@ -29,7 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false, AllowResults = false,
}))); })));
@ -50,7 +49,6 @@ namespace osu.Game.Tests.Visual.Gameplay
stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false, AllowResults = false,
})); }));

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

@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
private readonly FramedOffsetClock offsetClock; private readonly FramedOffsetClock offsetClock;
public GameplayClockContainer(WorkingBeatmap beatmap, bool allowLeadIn, double gameplayStartTime) public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime)
{ {
this.beatmap = beatmap; this.beatmap = beatmap;
@ -64,9 +64,7 @@ namespace osu.Game.Screens.Play
adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false }; adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
adjustableClock.Seek(allowLeadIn adjustableClock.Seek(Math.Min(0, gameplayStartTime - beatmap.BeatmapInfo.AudioLeadIn));
? Math.Min(0, gameplayStartTime - beatmap.BeatmapInfo.AudioLeadIn)
: gameplayStartTime);
adjustableClock.ProcessFrame(); adjustableClock.ProcessFrame();

3
osu.Game/Screens/Play/Player.cs
View File

@ -44,7 +44,6 @@ namespace osu.Game.Screens.Play
public bool HasFailed { get; private set; } public bool HasFailed { get; private set; }
public bool AllowPause { get; set; } = true; public bool AllowPause { get; set; } = true;
public bool AllowLeadIn { get; set; } = true;
public bool AllowResults { get; set; } = true; public bool AllowResults { get; set; } = true;
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;
@ -90,7 +89,7 @@ namespace osu.Game.Screens.Play
if (!ScoreProcessor.Mode.Disabled) if (!ScoreProcessor.Mode.Disabled)
config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode); config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
InternalChild = GameplayClockContainer = new GameplayClockContainer(working, AllowLeadIn, DrawableRuleset.GameplayStartTime); InternalChild = GameplayClockContainer = new GameplayClockContainer(working, DrawableRuleset.GameplayStartTime);
GameplayClockContainer.Children = new[] GameplayClockContainer.Children = new[]
{ {

1
osu.Game/Tests/Visual/AllPlayersTestCase.cs
View File

@ -83,7 +83,6 @@ namespace osu.Game.Tests.Visual
protected virtual Player CreatePlayer(Ruleset ruleset) => new Player protected virtual Player CreatePlayer(Ruleset ruleset) => new Player
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false, AllowResults = false,
}; };
} }

1
osu.Game/Tests/Visual/PlayerTestCase.cs
View File

@ -59,7 +59,6 @@ namespace osu.Game.Tests.Visual
protected virtual Player CreatePlayer(Ruleset ruleset) => new Player protected virtual Player CreatePlayer(Ruleset ruleset) => new Player
{ {
AllowPause = false, AllowPause = false,
AllowLeadIn = false,
AllowResults = false, AllowResults = false,
}; };
} }