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

Update in line with framework changes

Browse Source
This commit is contained in:
Dean Herbert 2018-02-28 21:50:52 +09:00
parent cff17f1864
commit 01fcf9c813
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.UI
//our clock will now be our parent's clock, but we want to replace this to allow manual control. //our clock will now be our parent's clock, but we want to replace this to allow manual control.
parentClock = Clock; parentClock = Clock;
ShouldProcessClock = false; ProcessCustomClock = false;
Clock = new FramedClock(clock = new ManualClock Clock = new FramedClock(clock = new ManualClock
{ {
CurrentTime = parentClock.CurrentTime, CurrentTime = parentClock.CurrentTime,

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

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play
AddInternal(content = new Container AddInternal(content = new Container
{ {
Clock = this.framedClock, Clock = this.framedClock,
ShouldProcessClock = false, ProcessCustomClock = false,
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}); });

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

@ -183,7 +183,7 @@ namespace osu.Game.Screens.Play
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Clock = offsetClock, Clock = offsetClock,
ShouldProcessClock = false, ProcessCustomClock = false,
Children = new[] Children = new[]
{ {
storyboardContainer = new Container storyboardContainer = new Container
@ -209,7 +209,7 @@ namespace osu.Game.Screens.Play
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Clock = offsetClock, Clock = offsetClock,
ShouldProcessClock = false, ProcessCustomClock = false,
Breaks = beatmap.Breaks Breaks = beatmap.Breaks
} }
} }

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

@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
if (FramedClock != null) if (FramedClock != null)
{ {
Clock = FramedClock; Clock = FramedClock;
ShouldProcessClock = false; ProcessCustomClock = false;
} }
Children = new Drawable[] Children = new Drawable[]