sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ruleset-configs' into mania-playfield-inversions

Browse Source
This commit is contained in:
smoogipoo
2018-06-11 15:08:48 +09:00
parent f49b7d6e16 14b7530994
commit 563a2667d3
4 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
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,27 +85,21 @@ namespace osu.Game.Rulesets.UI
Cursor = CreateCursor();
}
[BackgroundDependencyLoader(true)]
private void load([CanBeNull] OnScreenDisplay onScreenDisplay, [CanBeNull] SettingsStore settings)
{
this.onScreenDisplay = onScreenDisplay;
if (settings != null)
{
rulesetConfig = Ruleset.CreateConfig(settings);
if (rulesetConfig != null)
{
dependencies.Cache(rulesetConfig);
onScreenDisplay?.BeginTracking(this, rulesetConfig);
}
}
}
private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
{
var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
onScreenDisplay = dependencies.Get<OnScreenDisplay>();
rulesetConfig = dependencies.Get<RulesetConfigCache>().GetConfigFor(Ruleset);
if (rulesetConfig != null)
{
dependencies.Cache(rulesetConfig);
onScreenDisplay?.BeginTracking(this, rulesetConfig);
}
return dependencies;
}
public abstract ScoreProcessor CreateScoreProcessor();