diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a26db06ede..4b7f048c1b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
});
}
- protected override void OnApply(HitObject hitObject)
+ protected override void OnApply()
{
- base.OnApply(hitObject);
+ base.OnApply();
IndexInCurrentComboBindable.BindTo(HitObject.IndexInCurrentComboBindable);
PositionBindable.BindTo(HitObject.PositionBindable);
@@ -70,9 +70,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
LifetimeEnd = HitObject.GetEndTime() + HitObject.HitWindows.WindowFor(HitResult.Miss) + 1000;
}
- protected override void OnFree(HitObject hitObject)
+ protected override void OnFree()
{
- base.OnFree(hitObject);
+ base.OnFree();
IndexInCurrentComboBindable.UnbindFrom(HitObject.IndexInCurrentComboBindable);
PositionBindable.UnbindFrom(HitObject.PositionBindable);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 6340367593..dd27ac990e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -86,18 +86,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Tracking.BindValueChanged(updateSlidingSample);
}
- protected override void OnApply(HitObject hitObject)
+ protected override void OnApply()
{
- base.OnApply(hitObject);
+ base.OnApply();
// Ensure that the version will change after the upcoming BindTo().
pathVersion.Value = int.MaxValue;
PathVersion.BindTo(HitObject.Path.Version);
}
- protected override void OnFree(HitObject hitObject)
+ protected override void OnFree()
{
- base.OnFree(hitObject);
+ base.OnFree();
PathVersion.UnbindFrom(HitObject.Path.Version);
}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index fd0f35d20d..b5c33c0924 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -36,9 +36,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
pathVersion.BindValueChanged(_ => updatePosition());
}
- protected override void OnFree(HitObject hitObject)
+ protected override void OnFree()
{
- base.OnFree(hitObject);
+ base.OnFree();
pathVersion.UnbindFrom(drawableSlider.PathVersion);
}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index 3e777119c4..cd7d692b0a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -261,9 +261,9 @@ namespace osu.Game.Tests.Visual.Gameplay
});
}
- protected override void OnApply(HitObject hitObject)
+ protected override void OnApply()
{
- base.OnApply(hitObject);
+ base.OnApply();
Position = new Vector2(RNG.Next(-200, 200), RNG.Next(-200, 200));
}
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 2e37e8977a..9c799bcf32 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -260,7 +260,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
HitObject.DefaultsApplied += onDefaultsApplied;
- OnApply(hitObject);
+ OnApply();
HitObjectApplied?.Invoke(this);
// If not loaded, the state update happens in LoadComplete(). Otherwise, the update is scheduled to allow for lifetime updates.
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
HitObject.DefaultsApplied -= onDefaultsApplied;
- OnFree(HitObject);
+ OnFree();
HitObject = null;
Result = null;
@@ -340,16 +340,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
///
/// Invoked for this to take on any values from a newly-applied .
///
- /// The being applied.
- protected virtual void OnApply(HitObject hitObject)
+ protected virtual void OnApply()
{
}
///
/// Invoked for this to revert any values previously taken on from the currently-applied .
///
- /// The currently-applied .
- protected virtual void OnFree(HitObject hitObject)
+ protected virtual void OnFree()
{
}