h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 18:03:11 +08:00
Code Issues Releases Wiki Activity

Move ruleset dependency caching to CreateLocalDependencies

Browse Source 
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
This commit is contained in:
smoogipoo 2018-06-11 14:36:56 +09:00
parent f4fbf27d42
commit be01dbae3a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Rulesets/UI/RulesetContainer.cs
View File

@ -13,7 +13,6 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Configuration;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Input;
@ -86,11 +85,13 @@ namespace osu.Game.Rulesets.UI
Cursor = CreateCursor();
}
[BackgroundDependencyLoader(true)]
private void load([CanBeNull] OnScreenDisplay onScreenDisplay, [CanBeNull] SettingsStore settings)
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
{
this.onScreenDisplay = onScreenDisplay;
var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
onScreenDisplay = dependencies.Get<OnScreenDisplay>();
var settings = dependencies.Get<SettingsStore>();
if (settings != null)
{
rulesetConfig = Ruleset.CreateConfig(settings);
@ -101,13 +102,10 @@ namespace osu.Game.Rulesets.UI
onScreenDisplay?.BeginTracking(this, rulesetConfig);
}
}
return dependencies;
}
private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
public abstract ScoreProcessor CreateScoreProcessor();
/// <summary>