sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ruleset-ordering-fix

Browse Source
This commit is contained in:
Dean Herbert
2022-01-27 21:46:03 +09:00
committed by GitHub
parent 5637fd64d6 d7fd11a16d
commit 7af23328a4
42 changed files with 235 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Select.Carousel
bool match =
criteria.Ruleset == null ||
BeatmapInfo.Ruleset.ShortName == criteria.Ruleset.ShortName ||
(BeatmapInfo.RulesetID == 0 && criteria.Ruleset.OnlineID != 0 && criteria.AllowConvertedBeatmaps);
(BeatmapInfo.Ruleset.OnlineID == 0 && criteria.Ruleset.OnlineID != 0 && criteria.AllowConvertedBeatmaps);
if (BeatmapInfo.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
{
@ -90,6 +90,7 @@ namespace osu.Game.Screens.Select.Carousel
default:
case SortMode.Difficulty:
int ruleset = BeatmapInfo.Ruleset.CompareTo(otherBeatmap.BeatmapInfo.Ruleset);
if (ruleset != 0) return ruleset;
return BeatmapInfo.StarRating.CompareTo(otherBeatmap.BeatmapInfo.StarRating);