Rename SpeedAdjustment -> MultiplierControlPoint + reworking.

This commit is contained in:
smoogipooo
2017-06-09 16:57:17 +09:00
parent 4b2669e65d
commit 921350128d
11 changed files with 66 additions and 66 deletions

View File

@ -73,11 +73,11 @@ namespace osu.Game.Rulesets.Timing
var timingChangeY = y as SpeedAdjustmentContainer;
// If either of the two drawables are not hit objects, fall back to the base comparer
if (timingChangeX?.TimingSection == null || timingChangeY?.TimingSection == null)
if (timingChangeX?.MultiplierControlPoint == null || timingChangeY?.MultiplierControlPoint == null)
return base.Compare(x, y);
// Compare by start time
int i = timingChangeY.TimingSection.Time.CompareTo(timingChangeX.TimingSection.Time);
int i = timingChangeY.MultiplierControlPoint.StartTime.CompareTo(timingChangeX.MultiplierControlPoint.StartTime);
return i != 0 ? i : base.Compare(x, y);
}