RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-20 20:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion

Browse Source
This commit is contained in:
smoogipooo 2017-04-18 10:59:43 +09:00
commit 4a60e9299e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -39,7 +39,7 @@ namespace osu.Desktop.VisualTests.Tests
WorkingBeatmap beatmap = null;
var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.Ruleset.CreateInstance() is OsuRuleset);
var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.RulesetID == 0);
if (beatmapInfo != null)
beatmap = db.GetWorkingBeatmap(beatmapInfo);

4
osu.Game/Database/BeatmapDatabase.cs
View File

@ -276,8 +276,8 @@ namespace osu.Game.Database
//we need metadata
GetChildren(beatmapSetInfo);
foreach (var b in beatmapSetInfo.Beatmaps)
GetChildren(b);
//we also need a ruleset
GetChildren(beatmapInfo);
if (beatmapInfo.Metadata == null)
beatmapInfo.Metadata = beatmapSetInfo.Metadata;

2
osu.Game/Screens/Select/FilterCriteria.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Select
{
var set = g.BeatmapSet;
bool hasCurrentMode = set.Beatmaps.Any(bm => bm.RulesetID == Ruleset.ID);
bool hasCurrentMode = set.Beatmaps.Any(bm => bm.RulesetID == (Ruleset?.ID ?? 0));
bool match = hasCurrentMode;