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

Rename Beatmaps to BeatmapHashes for clarity

Browse Source
This commit is contained in:
Dean Herbert
2022-06-10 14:03:51 +09:00
parent 3b229624dd
commit 4a5e86e451
12 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ namespace osu.Game.Screens.Select.Carousel
}
if (match)
match &= criteria.Collection?.Beatmaps.Contains(BeatmapInfo.MD5Hash) ?? true;
match &= criteria.Collection?.BeatmapHashes.Contains(BeatmapInfo.MD5Hash) ?? true;
if (match && criteria.RulesetCriteria != null)
match &= criteria.RulesetCriteria.Matches(BeatmapInfo);

6
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -256,12 +256,12 @@ namespace osu.Game.Screens.Select.Carousel
return new ToggleMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
{
if (s)
collection.Beatmaps.Add(beatmapInfo.MD5Hash);
collection.BeatmapHashes.Add(beatmapInfo.MD5Hash);
else
collection.Beatmaps.Remove(beatmapInfo.MD5Hash);
collection.BeatmapHashes.Remove(beatmapInfo.MD5Hash);
})
{
State = { Value = collection.Beatmaps.Contains(beatmapInfo.MD5Hash) }
State = { Value = collection.BeatmapHashes.Contains(beatmapInfo.MD5Hash) }
};
}

8
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -245,7 +245,7 @@ namespace osu.Game.Screens.Select.Carousel
TernaryState state;
int countExisting = beatmapSet.Beatmaps.Count(b => collection.Beatmaps.Contains(b.MD5Hash));
int countExisting = beatmapSet.Beatmaps.Count(b => collection.BeatmapHashes.Contains(b.MD5Hash));
if (countExisting == beatmapSet.Beatmaps.Count)
state = TernaryState.True;
@ -261,14 +261,14 @@ namespace osu.Game.Screens.Select.Carousel
switch (s)
{
case TernaryState.True:
if (collection.Beatmaps.Contains(b.MD5Hash))
if (collection.BeatmapHashes.Contains(b.MD5Hash))
continue;
collection.Beatmaps.Add(b.MD5Hash);
collection.BeatmapHashes.Add(b.MD5Hash);
break;
case TernaryState.False:
collection.Beatmaps.Remove(b.MD5Hash);
collection.BeatmapHashes.Remove(b.MD5Hash);
break;
}
}