From b74248a705665adf9f68037c5f8dfbb9b26e7f7a Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 29 Dec 2017 16:22:06 +0900 Subject: [PATCH] Rename application method --- osu.Game.Rulesets.Osu/Mods/OsuMod.cs | 6 +++--- osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs | 4 ++-- osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs | 2 +- osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs index 77ce7235ee..09360bea68 100644 --- a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs +++ b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs @@ -41,10 +41,10 @@ namespace osu.Game.Rulesets.Osu.Mods public void ApplyToDrawableHitObjects(IEnumerable drawables) { foreach (var d in drawables.OfType()) - d.ApplyCustomUpdateState += CustomSequence; + d.ApplyCustomUpdateState += ApplyHiddenState; } - protected void CustomSequence(DrawableHitObject drawable, ArmedState state) + protected void ApplyHiddenState(DrawableHitObject drawable, ArmedState state) { if (!(drawable is DrawableOsuHitObject d)) return; @@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Mods circle.FadeIn(fadeIn).Then().FadeOut(fadeOut); // override fade in as it somehow gets cut otherwise break; case DrawableSlider slider: - slider.InitialCircle.ApplyCustomUpdateState += CustomSequence; + slider.InitialCircle.ApplyCustomUpdateState += ApplyHiddenState; using (slider.BeginAbsoluteSequence(fadeOutTime, true)) { diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs index ddb6000fbb..045d95e942 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().CustomSequence; + drawable.ApplyCustomUpdateState += new TestOsuModHidden().ApplyHiddenState; Add(drawable); } @@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.Tests private class TestOsuModHidden : OsuModHidden { - public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.CustomSequence(drawable, state); + public new void ApplyHiddenState(DrawableHitObject drawable, ArmedState state) => base.ApplyHiddenState(drawable, state); } private class TestDrawableHitCircle : DrawableHitCircle diff --git a/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs b/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs index 8b2eb8baef..87ed67fe82 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs @@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Tests private class TestOsuModHidden : OsuModHidden { - public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.CustomSequence(drawable, state); + 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 4f97ba9697..96f9b6b97f 100644 --- a/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs +++ b/osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs @@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests private class TestOsuModHidden : OsuModHidden { - public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.CustomSequence(drawable, state); + public new void CustomSequence(DrawableHitObject drawable, ArmedState state) => base.ApplyHiddenState(drawable, state); } } }