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

Fix merge regression

Browse Source
This commit is contained in:
Dean Herbert
2019-11-22 14:14:18 +09:00
parent 5d2a608be0 5d2a608be0
commit 83080c3b5f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,12 +63,12 @@ namespace osu.Game.Screens.Play
private readonly FramedOffsetClock platformOffsetClock; private readonly FramedOffsetClock platformOffsetClock;
public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime, double firstHitObjectTime) public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
{ {
this.beatmap = beatmap; this.beatmap = beatmap;
this.mods = mods; this.mods = mods;
this.gameplayStartTime = gameplayStartTime; this.gameplayStartTime = gameplayStartTime;
this.firstHitObjectTime = firstHitObjectTime; this.firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;

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

@ -129,7 +129,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, Mods.Value, DrawableRuleset.GameplayStartTime, DrawableRuleset.Objects.First().StartTime); InternalChild = GameplayClockContainer = new GameplayClockContainer(working, Mods.Value, DrawableRuleset.GameplayStartTime);
addUnderlayComponents(GameplayClockContainer); addUnderlayComponents(GameplayClockContainer);
addGameplayComponents(GameplayClockContainer, working); addGameplayComponents(GameplayClockContainer, working);