From 40f560d7d0022c9882c0571e40d34658600e447d Mon Sep 17 00:00:00 2001
From: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date: Sun, 22 May 2022 21:45:27 +0100
Subject: [PATCH] Remove internal process method
---
osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs | 4 ++--
osu.Game/Rulesets/Difficulty/Skills/Skill.cs | 7 +------
osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index b5aec0d659..b030c0c560 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Difficulty
foreach (var skill in skills)
{
cancellationToken.ThrowIfCancellationRequested();
- skill.ProcessInternal(hitObject);
+ skill.Process(hitObject);
}
}
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Difficulty
foreach (var skill in skills)
{
cancellationToken.ThrowIfCancellationRequested();
- skill.ProcessInternal(hitObject);
+ skill.Process(hitObject);
}
attribs.Add(new TimedDifficultyAttributes(hitObject.EndTime * clockRate, CreateDifficultyAttributes(progressiveBeatmap, playableMods, skills, clockRate)));
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index f23f3b5f2a..770754f304 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -27,16 +27,11 @@ namespace osu.Game.Rulesets.Difficulty.Skills
this.mods = mods;
}
- internal void ProcessInternal(DifficultyHitObject current)
- {
- Process(current);
- }
-
///
/// Process a .
///
/// The to process.
- protected abstract void Process(DifficultyHitObject current);
+ public abstract void Process(DifficultyHitObject current);
///
/// Returns the calculated difficulty value representing all s that have been processed up to this point.
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index eb3203e9ec..6be10db8b3 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
///
/// Process a and update current strain values accordingly.
///
- protected sealed override void Process(DifficultyHitObject current)
+ public sealed override void Process(DifficultyHitObject current)
{
// The first object doesn't generate a strain, so we begin with an incremented section end
if (current.Position == 0)