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

Fix base.CreateLocalDependencies sometimes not being called

Browse Source
This commit is contained in:
smoogipoo 2018-05-24 13:03:25 +09:00
parent 5a517bad63
commit f1ac84d95b
9 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/TestCaseChatLink.cs
View File

@ -36,7 +36,8 @@ namespace osu.Game.Tests.Visual
}; };
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent); protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
public TestCaseChatLink() public TestCaseChatLink()
{ {

2
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(parent); => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()

3
osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
View File

@ -48,7 +48,8 @@ namespace osu.Game.Tests.Visual
typeof(DrawableCarouselBeatmapSet), typeof(DrawableCarouselBeatmapSet),
}; };
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent); protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
private class TestSongSelect : PlaySongSelect private class TestSongSelect : PlaySongSelect
{ {

2
osu.Game.Tests/Visual/TestCasePlaybackControl.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(parent); => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()

3
osu.Game.Tests/Visual/TestCaseSettings.cs
View File

@ -16,7 +16,8 @@ namespace osu.Game.Tests.Visual
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent); protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
public TestCaseSettings() public TestCaseSettings()
{ {

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(parent); => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)

3
osu.Game/Screens/Select/SongSelect.cs
View File

@ -68,7 +68,8 @@ namespace osu.Game.Screens.Select
private GameBeatmap beatmap; private GameBeatmap beatmap;
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent); protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
protected SongSelect() protected SongSelect()
{ {

2
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(parent); => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
protected EditorClockTestCase() protected EditorClockTestCase()
{ {

2
osu.Game/Tests/Visual/OsuTestCase.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual
// The beatmap is constructed here rather than load() because our children get dependencies injected before our load() runs // The beatmap is constructed here rather than load() because our children get dependencies injected before our load() runs
Beatmap = new GameBeatmap(new DummyWorkingBeatmap(), parent.Get<AudioManager>()); Beatmap = new GameBeatmap(new DummyWorkingBeatmap(), parent.Get<AudioManager>());
dependencies = new DependencyContainer(parent); dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
dependencies.CacheAs<IGameBeatmap>(Beatmap); dependencies.CacheAs<IGameBeatmap>(Beatmap);
dependencies.Cache(Beatmap); dependencies.Cache(Beatmap);