h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-27 10:50:11 +08:00
Code Issues Releases Wiki Activity

Merge branch 'equivalent-to' into control-point-grouping

Browse Source
This commit is contained in:
Dean Herbert
2019-10-25 23:15:15 +09:00
Unverified
parent e987db37ec e39016bf01
commit d4fed43be7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+1 -1
View File
@@ -46,6 +46,6 @@ namespace osu.Game.Beatmaps.ControlPoints
public override bool EquivalentTo(ControlPoint other) =>
other is SampleControlPoint otherTyped &&
string.Equals(SampleBank, otherTyped?.SampleBank) && SampleVolume == otherTyped?.SampleVolume;
string.Equals(SampleBank, otherTyped.SampleBank) && SampleVolume == otherTyped.SampleVolume;
}
}
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+1 -1
View File
@@ -28,6 +28,6 @@ namespace osu.Game.Beatmaps.ControlPoints
public override bool EquivalentTo(ControlPoint other) =>
other is TimingControlPoint otherTyped
&& TimeSignature == otherTyped?.TimeSignature && beatLength.Equals(otherTyped.beatLength);
&& TimeSignature == otherTyped.TimeSignature && beatLength.Equals(otherTyped.beatLength);
}
}