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

Remove resolution to SkinManager and use pattern matching instead

Browse Source
This commit is contained in:
Salman Ahmed 2021-06-28 12:43:12 +03:00
parent 035fe2ad49
commit 7197998a10
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Skinning/RulesetSkinProvidingContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -45,15 +46,12 @@ namespace osu.Game.Skinning
};
}
private SkinManager skinManager;
private ISkinSource parentSource;
private ResourceStoreBackedSkin rulesetResourcesSkin;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
skinManager = parent.Get<SkinManager>();
parentSource = parent.Get<ISkinSource>();
parentSource.SourceChanged += OnSourceChanged;
@ -90,13 +88,13 @@ namespace osu.Game.Skinning
}
}
int defaultSkinIndex = SkinSources.IndexOf(skinManager.DefaultSkin);
int lastDefaultSkinIndex = SkinSources.IndexOf(SkinSources.OfType<DefaultSkin>().Last());
// Ruleset resources should be given the ability to override game-wide defaults
// This is achieved by placing them before an instance of DefaultSkin.
// This is achieved by placing them before the last instance of DefaultSkin.
// Note that DefaultSkin may not be present in some test scenes.
if (defaultSkinIndex >= 0)
SkinSources.Insert(defaultSkinIndex, rulesetResourcesSkin);
if (lastDefaultSkinIndex >= 0)
SkinSources.Insert(lastDefaultSkinIndex, rulesetResourcesSkin);
else
SkinSources.Add(rulesetResourcesSkin);
}