diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs index 045d95e942..c0a67e5dc1 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs @@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Tests drawable.State.Value = ArmedState.Hit; if (hidden) - drawable.ApplyCustomUpdateState += new TestOsuModHidden().ApplyHiddenState; + new OsuModHidden().ApplyToDrawableHitObjects(new [] { drawable }); Add(drawable); } @@ -81,11 +81,6 @@ namespace osu.Game.Rulesets.Osu.Tests } } - private class TestOsuModHidden : OsuModHidden - { - public new void ApplyHiddenState(DrawableHitObject drawable, ArmedState state) => base.ApplyHiddenState(drawable, state); - } - private class TestDrawableHitCircle : DrawableHitCircle { private readonly bool auto; diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs index 87ed67fe82..9acf286915 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs @@ -14,7 +14,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables; using osu.Game.Tests.Visual; using OpenTK; using osu.Game.Rulesets.Osu.Mods; -using osu.Game.Rulesets.Objects.Drawables; namespace osu.Game.Rulesets.Osu.Tests { @@ -126,15 +125,10 @@ namespace osu.Game.Rulesets.Osu.Tests }; if (hidden) - drawable.ApplyCustomUpdateState += new TestOsuModHidden().CustomSequence; + new OsuModHidden().ApplyToDrawableHitObjects(new [] { drawable }); Add(drawable); } - - private class TestOsuModHidden : OsuModHidden - { - public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.ApplyHiddenState(drawable, state); - } } } diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs index 96f9b6b97f..895984c1ce 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs @@ -7,7 +7,6 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; using osu.Game.Beatmaps.ControlPoints; -using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects.Drawables; @@ -50,14 +49,9 @@ namespace osu.Game.Rulesets.Osu.Tests }; if (hidden) - drawable.ApplyCustomUpdateState += new TestOsuModHidden().CustomSequence; + new OsuModHidden().ApplyToDrawableHitObjects(new [] { drawable }); Add(drawable); } - - private class TestOsuModHidden : OsuModHidden - { - public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.ApplyHiddenState(drawable, state); - } } }