h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Merge branch 'control-point-grouping' into no-auto-gen

Browse Source
This commit is contained in:
Dean Herbert 2019-10-25 23:15:25 +09:00
commit eefa411182
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
View File

@ -46,6 +46,6 @@ namespace osu.Game.Beatmaps.ControlPoints
public override bool EquivalentTo(ControlPoint other) => public override bool EquivalentTo(ControlPoint other) =>
other is SampleControlPoint otherTyped && other is SampleControlPoint otherTyped &&
string.Equals(SampleBank, otherTyped?.SampleBank) && SampleVolume == otherTyped?.SampleVolume; string.Equals(SampleBank, otherTyped.SampleBank) && SampleVolume == otherTyped.SampleVolume;
} }
} }

2
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
View File

@ -28,6 +28,6 @@ namespace osu.Game.Beatmaps.ControlPoints
public override bool EquivalentTo(ControlPoint other) => public override bool EquivalentTo(ControlPoint other) =>
other is TimingControlPoint otherTyped other is TimingControlPoint otherTyped
&& TimeSignature == otherTyped?.TimeSignature && beatLength.Equals(otherTyped.beatLength); && TimeSignature == otherTyped.TimeSignature && beatLength.Equals(otherTyped.beatLength);
} }
} }