From 860b607f45aa46a943ea873e1274d41b8363df41 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 19 May 2017 16:49:05 +0900 Subject: [PATCH] A bit more cleanup. --- .../Beatmaps/ManiaBeatmapConverter.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs index 86ce698170..6bdf913c83 100644 --- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs +++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs @@ -20,12 +20,15 @@ namespace osu.Game.Rulesets.Mania.Beatmaps private Pattern lastPattern = new Pattern(); private FastRandom random; + private Beatmap beatmap; private bool isForCurrentRuleset; protected override Beatmap ConvertBeatmap(Beatmap original, bool isForCurrentRuleset) { this.isForCurrentRuleset = isForCurrentRuleset; + beatmap = original; + BeatmapDifficulty difficulty = original.BeatmapInfo.Difficulty; int seed = (int)Math.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)Math.Round(difficulty.ApproachRate); @@ -43,11 +46,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps yield break; } - IEnumerable objects; - if (isForCurrentRuleset) - objects = generateSpecific(original, beatmap); - else - objects = generateConverted(original, beatmap); + var objects = isForCurrentRuleset ? generateSpecific(original) : generateConverted(original); if (objects == null) yield break; @@ -60,9 +59,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps /// Method that generates hit objects for osu!mania specific beatmaps. /// /// The original hit object. - /// The beatmap. /// The hit objects generated. - private IEnumerable generateSpecific(HitObject original, Beatmap beatmap) + private IEnumerable generateSpecific(HitObject original) { var generator = new SpecificBeatmapPatternGenerator(random, original, beatmap, lastPattern); @@ -76,9 +74,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps /// Method that generates hit objects for non-osu!mania beatmaps. /// /// The original hit object. - /// The beatmap. /// The hit objects generated. - private IEnumerable generateConverted(HitObject original, Beatmap beatmap) + private IEnumerable generateConverted(HitObject original) { var endTimeData = original as IHasEndTime; var distanceData = original as IHasDistance;