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

Merge branch 'master' into mania-important-frames

Browse Source
This commit is contained in:
Dean Herbert 2017-11-29 18:12:57 +09:00 committed by GitHub
commit 404e7d62ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit d92cec764538da2e7ed95bfb566f6bc81a9667c8 Subproject commit 4fc866eee3803f88b155150e32e021b9c21e647f

14
osu.Game/Tests/Visual/TestCasePlayer.cs
View File

@ -50,7 +50,11 @@ namespace osu.Game.Tests.Visual
string instantiation = ruleset?.AssemblyQualifiedName; string instantiation = ruleset?.AssemblyQualifiedName;
foreach (var r in rulesets.AvailableRulesets.Where(rs => instantiation == null || rs.InstantiationInfo == instantiation)) foreach (var r in rulesets.AvailableRulesets.Where(rs => instantiation == null || rs.InstantiationInfo == instantiation))
AddStep(r.Name, () => loadPlayerFor(r)); {
Player p = null;
AddStep(r.Name, () => p = loadPlayerFor(r));
AddUntilStep(() => p.IsLoaded);
}
} }
protected virtual Beatmap CreateBeatmap() protected virtual Beatmap CreateBeatmap()
@ -64,7 +68,7 @@ namespace osu.Game.Tests.Visual
return beatmap; return beatmap;
} }
private void loadPlayerFor(RulesetInfo r) private Player loadPlayerFor(RulesetInfo r)
{ {
var beatmap = CreateBeatmap(); var beatmap = CreateBeatmap();
@ -78,7 +82,11 @@ namespace osu.Game.Tests.Visual
if (Player != null) if (Player != null)
Remove(Player); Remove(Player);
LoadScreen(CreatePlayer(working, instance)); var player = CreatePlayer(working, instance);
LoadComponentAsync(player, LoadScreen);
return player;
} }
protected virtual Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset) => new Player protected virtual Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset) => new Player