RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply requested changes

This commit is contained in:
AlFasGD 2018-05-21 13:23:39 +03:00
parent 6f94c110a5
commit a54bda6ce1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit fac688633b8fcf34ae5d0514c26b03e217161eb4
Subproject commit 80e78fd45bb79ca4bc46ecc05deb6058f3879faa

5
osu.Game/Screens/Edit/EditorClock.cs
View File

@ -18,9 +18,7 @@ namespace osu.Game.Screens.Edit
/// </summary>
public class EditorClock : DecoupleableInterpolatingFramedClock
{
//public Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
public double TrackLength;
public readonly double TrackLength;
public ControlPointInfo ControlPointInfo;
@ -33,6 +31,7 @@ public EditorClock(Bindable<WorkingBeatmap> beatmap, BindableBeatDivisor beatDiv
ControlPointInfo = beatmap.Value.Beatmap.ControlPointInfo;
TrackLength = beatmap.Value.Track.Length;
}
public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
{
this.beatDivisor = beatDivisor;