sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-effect-points

Browse Source
This commit is contained in:
Dean Herbert
2019-12-18 01:43:15 +09:00
committed by GitHub
parent 36f541d8e5 98f4e345ab
commit 036efb9947
181 changed files with 1596 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
View File

@ -195,8 +195,8 @@ namespace osu.Game.Beatmaps.ControlPoints
if (time < list[0].Time)
return null;
if (time >= list[list.Count - 1].Time)
return list[list.Count - 1];
if (time >= list[^1].Time)
return list[^1];
int l = 0;
int r = list.Count - 2;

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

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