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

Revert GetRulesetTransformedSkin accessibility change

Browse Source 
This reverts commit 521077b714.

Forgot to do it when I made this `protected`, but subclasses in test scenes require this.
This commit is contained in:
Salman Ahmed 2021-06-16 16:48:30 +03:00
parent 521077b714
commit 5ebf570ec4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace osu.Game.Skinning
Ruleset = ruleset; Ruleset = ruleset;
Beatmap = beatmap; Beatmap = beatmap;
InternalChild = new BeatmapSkinProvidingContainer(getRulesetTransformedSkin(beatmapSkin)) InternalChild = new BeatmapSkinProvidingContainer(GetRulesetTransformedSkin(beatmapSkin))
{ {
Child = Content = new Container Child = Content = new Container
{ {
@ -54,17 +54,17 @@ namespace osu.Game.Skinning
{ {
SkinSources.Clear(); SkinSources.Clear();
SkinSources.Add(getRulesetTransformedSkin(skinManager.CurrentSkin.Value)); SkinSources.Add(GetRulesetTransformedSkin(skinManager.CurrentSkin.Value));
// TODO: we also want to return a DefaultLegacySkin here if the current *beatmap* is providing any skinned elements. // TODO: we also want to return a DefaultLegacySkin here if the current *beatmap* is providing any skinned elements.
if (skinManager.CurrentSkin.Value is LegacySkin && skinManager.CurrentSkin.Value != skinManager.DefaultLegacySkin) if (skinManager.CurrentSkin.Value is LegacySkin && skinManager.CurrentSkin.Value != skinManager.DefaultLegacySkin)
SkinSources.Add(getRulesetTransformedSkin(skinManager.DefaultLegacySkin)); SkinSources.Add(GetRulesetTransformedSkin(skinManager.DefaultLegacySkin));
if (skinManager.CurrentSkin.Value != skinManager.DefaultSkin) if (skinManager.CurrentSkin.Value != skinManager.DefaultSkin)
SkinSources.Add(getRulesetTransformedSkin(skinManager.DefaultSkin)); SkinSources.Add(GetRulesetTransformedSkin(skinManager.DefaultSkin));
} }
private ISkin getRulesetTransformedSkin(ISkin skin) protected ISkin GetRulesetTransformedSkin(ISkin skin)
{ {
if (skin == null) if (skin == null)
return null; return null;

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

@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual
base.UpdateSkins(); base.UpdateSkins();
if (skin != null) if (skin != null)
SkinSources.Insert(0, Ruleset.CreateLegacySkinProvider(skin, Beatmap)); SkinSources.Insert(0, GetRulesetTransformedSkin(skin));
} }
} }
} }