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

Merge branch 'mania-holdnote-input' into mania-judgements

This commit is contained in:
smoogipooo 2017-05-29 11:23:32 +09:00
parent af137f40e5 cd1da469c7
commit 79cdba58c1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 0b9053ec3d39b486165992374752b280c5eeef06
Subproject commit aa3e296968873208ca4460b00c0b82fe3aa8ff5c

4
osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
View File

@ -29,8 +29,6 @@ public class ControlPointContainer : Container<Drawable>
private readonly List<DrawableControlPoint> drawableControlPoints;
protected override IComparer<Drawable> DepthComparer => new HitObjectStartTimeComparer();
public ControlPointContainer(IEnumerable<TimingChange> timingChanges)
{
drawableControlPoints = timingChanges.Select(t => new DrawableControlPoint(t)).ToList();
@ -131,6 +129,8 @@ public override void Add(Drawable drawable)
/// </summary>
private class AutoTimeRelativeContainer : Container
{
protected override IComparer<Drawable> DepthComparer => new HitObjectReverseStartTimeComparer();
public override void InvalidateFromChild(Invalidation invalidation)
{
// We only want to re-compute our size when a child's size or position has changed

4
osu.Game/Rulesets/Objects/HitObjectStartTimeComparer.cs
View File

@ -17,7 +17,7 @@ public override int Compare(Drawable x, Drawable y)
var hitObjectY = y as DrawableHitObject;
// If either of the two drawables are not hit objects, fall back to the base comparer
if ((hitObjectX ?? hitObjectY) == null)
if (hitObjectX?.HitObject == null || hitObjectY?.HitObject == null)
return base.Compare(x, y);
// Compare by start time
@ -41,7 +41,7 @@ public override int Compare(Drawable x, Drawable y)
var hitObjectY = y as DrawableHitObject;
// If either of the two drawables are not hit objects, fall back to the base comparer
if ((hitObjectX ?? hitObjectY) == null)
if (hitObjectX?.HitObject == null || hitObjectY?.HitObject == null)
return base.Compare(x, y);
// Compare by start time