h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Code Issues Releases Wiki Activity

Rename application method

Browse Source
This commit is contained in:
Dean Herbert 2017-12-29 16:22:06 +09:00
parent 3f8f778004
commit b74248a705
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu/Mods/OsuMod.cs
View File

@ -41,10 +41,10 @@ namespace osu.Game.Rulesets.Osu.Mods
public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
{
foreach (var d in drawables.OfType<DrawableOsuHitObject>())
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))
{

4
osu.Game.Rulesets.Osu/Tests/TestCaseHitCircle.cs
View File

@ -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

2
osu.Game.Rulesets.Osu/Tests/TestCaseSlider.cs
View File

@ -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);
}
}

2
osu.Game.Rulesets.Osu/Tests/TestCaseSpinner.cs
View File

@ -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);
}
}
}