diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index b8d1313af5..8f6a8c42b1 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
private readonly Column column;
[Cached]
- private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 1 };
+ private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 2 };
public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
{
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c6b20b1baf..746dda6733 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Mania
switch (skin)
{
case LegacySkin:
- return new ManiaLegacySkinTransformer(skin, beatmap);
+ return new ManiaLegacySkinTransformer(skin);
case ArgonSkin:
return new ManiaArgonSkinTransformer(skin);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 352b205c0b..0a59c10b5f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Audio.Sample;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Game.Audio;
-using osu.Game.Beatmaps;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Objects.Legacy;
using osu.Game.Rulesets.Scoring;
@@ -19,8 +18,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{
public class ManiaLegacySkinTransformer : LegacySkinTransformer
{
- private readonly ManiaBeatmap beatmap;
-
///
/// Mapping of to their corresponding
/// value.
@@ -59,15 +56,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
///
private readonly Lazy hasKeyTexture;
- public ManiaLegacySkinTransformer(ISkin skin, IBeatmap beatmap)
+ public ManiaLegacySkinTransformer(ISkin skin)
: base(skin)
{
- this.beatmap = (ManiaBeatmap)beatmap;
-
isLegacySkin = new Lazy(() => GetConfig(SkinConfiguration.LegacySetting.Version) != null);
hasKeyTexture = new Lazy(() =>
{
- string keyImage = this.GetManiaSkinConfig(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition(), 0)?.Value ?? "mania-key1";
+ string keyImage = this.GetManiaSkinConfig(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition { Columns = 1 }, 0)?.Value ?? "mania-key1";
return this.GetAnimation(keyImage, true, true) != null;
});
}
@@ -149,7 +144,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
public override IBindable GetConfig(TLookup lookup)
{
if (lookup is ManiaSkinConfigurationLookup maniaLookup)
- return base.GetConfig(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
+ return base.GetConfig(new LegacyManiaSkinConfigurationLookup(maniaLookup.StageDefinition.Columns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
return base.GetConfig(lookup);
}