h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 16:02:58 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors

Browse Source
This commit is contained in:
smoogipoo 2019-04-17 16:11:59 +09:00
parent ad720cedeb
commit 5a3d6a0258
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Gameplay/TestCasePlayerLoader.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("load player", () =>
{
SelectedMods.Value = new[] { gameMod = new TestMod() };
Mods.Value = new[] { gameMod = new TestMod() };
InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre);
stack.Push(new PlayerLoader(() => player = new TestPlayer()));
});
@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
if (player.IsCurrentScreen())
{
playerMod1 = (TestMod)player.SelectedMods.Value.Single();
playerMod1 = (TestMod)player.Mods.Value.Single();
return true;
}
@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
if (player.IsCurrentScreen())
{
playerMod2 = (TestMod)player.SelectedMods.Value.Single();
playerMod2 = (TestMod)player.Mods.Value.Single();
return true;
}
@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private class TestPlayer : Player
{
public new Bindable<IEnumerable<Mod>> SelectedMods => base.SelectedMods;
public new Bindable<IReadOnlyList<Mod>> Mods => base.Mods;
public TestPlayer()
: base(false, false)

6
osu.Game/Screens/Play/Player.cs
View File

@ -71,8 +71,8 @@ namespace osu.Game.Screens.Play
protected GameplayClockContainer GameplayClockContainer { get; private set; }
[Cached]
[Cached(Type = typeof(IBindable<IEnumerable<Mod>>))]
protected readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>(Enumerable.Empty<Mod>());
[Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
protected readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
private readonly bool allowPause;
private readonly bool showResults;
@ -93,7 +93,7 @@ namespace osu.Game.Screens.Play
{
this.api = api;
SelectedMods.Value = base.SelectedMods.Value.Select(m => m.CreateCopy()).ToArray();
Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
WorkingBeatmap working = loadBeatmap();