diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherSkinning.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherSkinning.cs index fa9486b087..e1ec88d4a9 100644 --- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherSkinning.cs +++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherSkinning.cs @@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests typeof(CatcherSprite), }; - private Container container; + private readonly Container container; public TestSceneCatcherSkinning() { @@ -79,7 +79,11 @@ namespace osu.Game.Rulesets.Catch.Tests private class CatchCustomSkinSourceContainer : Container, ISkinSource { - public event Action SourceChanged; + public event Action SourceChanged + { + add { } + remove { } + } public Drawable GetDrawableComponent(string componentName) => new CatcherCustomSkin(); diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs index 18121bba4b..0b06e958e6 100644 --- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs +++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs @@ -6,7 +6,6 @@ using System.Linq; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Sprites; using osu.Framework.Input.Bindings; using osu.Framework.MathUtils; using osu.Game.Beatmaps; diff --git a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs index 24e5ec500a..1308a9b7a1 100644 --- a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs +++ b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs @@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Catch.UI { public class CatcherSprite : SkinReloadableDrawable { - private Drawable catcher; - public CatcherSprite() { Size = new Vector2(CatcherArea.CATCHER_SIZE); @@ -26,10 +24,10 @@ namespace osu.Game.Rulesets.Catch.UI [BackgroundDependencyLoader] private void load(TextureStore textures) { - InternalChild = new Container() + InternalChild = new Container { RelativeSizeAxes = Axes.Both, - Child = catcher = new SkinnableDrawable("fruit-catcher-idle", _ => new Sprite() + Child = new SkinnableDrawable("fruit-catcher-idle", _ => new Sprite { Texture = textures.Get(@"Play/Catch/fruit-catcher-idle"), RelativeSizeAxes = Axes.Both,