RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-22 02:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullref.

Browse Source
This commit is contained in:
smoogipooo 2017-08-23 13:39:51 +09:00
parent 0e41fc8842
commit 84dd1283de
1 changed files with 6 additions and 6 deletions

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

@ -249,7 +249,7 @@ namespace osu.Game.Rulesets.UI
public Playfield<TObject, TJudgement> Playfield { get; private set; } public Playfield<TObject, TJudgement> Playfield { get; private set; }
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
private readonly Container content; private Container content;
private readonly List<DrawableHitObject<TObject, TJudgement>> drawableObjects = new List<DrawableHitObject<TObject, TJudgement>>(); private readonly List<DrawableHitObject<TObject, TJudgement>> drawableObjects = new List<DrawableHitObject<TObject, TJudgement>>();
@ -261,6 +261,11 @@ namespace osu.Game.Rulesets.UI
/// <param name="isForCurrentRuleset">Whether to assume the beatmap is for the current ruleset.</param> /// <param name="isForCurrentRuleset">Whether to assume the beatmap is for the current ruleset.</param>
protected RulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap, bool isForCurrentRuleset) protected RulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap, bool isForCurrentRuleset)
: base(ruleset, beatmap, isForCurrentRuleset) : base(ruleset, beatmap, isForCurrentRuleset)
{
}
[BackgroundDependencyLoader]
private void load()
{ {
InputManager.Add(content = new Container InputManager.Add(content = new Container
{ {
@ -269,11 +274,6 @@ namespace osu.Game.Rulesets.UI
}); });
AddInternal(InputManager); AddInternal(InputManager);
}
[BackgroundDependencyLoader]
private void load()
{
KeyBindingInputManager.Add(Playfield = CreatePlayfield()); KeyBindingInputManager.Add(Playfield = CreatePlayfield());
loadObjects(); loadObjects();