sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-03 20:57:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary secondary argument from HUDOverlay

Browse Source
This commit is contained in:
Dean Herbert 2018-02-27 16:02:48 +09:00
parent 0635ae2293
commit d4f1723ae6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
private static bool hasShownNotificationOnce; private static bool hasShownNotificationOnce;
public HUDOverlay(ScoreProcessor scoreProcessor, RulesetContainer rulesetContainer, DecoupleableInterpolatingFramedClock decoupledClock, WorkingBeatmap working, IAdjustableClock adjustableSourceClock) public HUDOverlay(ScoreProcessor scoreProcessor, RulesetContainer rulesetContainer, IAdjustableClock seekableClock, WorkingBeatmap working)
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
@ -66,13 +66,13 @@ namespace osu.Game.Screens.Play
BindRulesetContainer(rulesetContainer); BindRulesetContainer(rulesetContainer);
Progress.Objects = rulesetContainer.Objects; Progress.Objects = rulesetContainer.Objects;
Progress.AudioClock = decoupledClock; Progress.AudioClock = seekableClock;
Progress.AllowSeeking = rulesetContainer.HasReplayLoaded; Progress.AllowSeeking = rulesetContainer.HasReplayLoaded;
Progress.OnSeek = pos => decoupledClock.Seek(pos); Progress.OnSeek = pos => seekableClock.Seek(pos);
ModDisplay.Current.BindTo(working.Mods); ModDisplay.Current.BindTo(working.Mods);
PlayerSettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock; PlayerSettingsOverlay.PlaybackSettings.AdjustableClock = seekableClock;
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]

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

@ -185,12 +185,13 @@ namespace osu.Game.Screens.Play
Clock = offsetClock, Clock = offsetClock,
Child = RulesetContainer, Child = RulesetContainer,
}, },
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, decoupledClock, working, adjustableSourceClock)
new SkipButton(firstObjectTime) new SkipButton(firstObjectTime)
{ {
SeekableClock = decoupledClock, SeekableClock = decoupledClock,
FramedClock = offsetClock, FramedClock = offsetClock,
}, },
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, decoupledClock, working)
{
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}, },