h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 15:53:19 +08:00
Code Issues Releases Wiki Activity

Update to match base branch.

Browse Source
This commit is contained in:
smoogipooo 2017-05-19 17:48:23 +09:00
parent 5d8f0a4707
commit 90270ac586
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Mania.Beatmaps.Patterns; using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
using osu.Game.Rulesets.Mania.MathUtils; using osu.Game.Rulesets.Mania.MathUtils;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
namespace osu.Game.Rulesets.Mania.Beatmaps namespace osu.Game.Rulesets.Mania.Beatmaps
{ {
@ -83,12 +84,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
// Following lines currently commented out to appease resharper // Following lines currently commented out to appease resharper
//Patterns.PatternGenerator conversion = null; Patterns.PatternGenerator conversion = null;
if (distanceData != null) if (distanceData != null)
{ conversion = new DistanceObjectPatternGenerator(random, original, beatmap, lastPattern);
// Slider
}
else if (endTimeData != null) else if (endTimeData != null)
{ {
// Spinner // Spinner
@ -98,13 +97,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
// Circle // Circle
} }
//if (conversion == null) if (conversion == null)
return null; return null;
//Pattern newPattern = conversion.Generate(); Pattern newPattern = conversion.Generate();
//lastPattern = newPattern; lastPattern = newPattern;
//return newPattern.HitObjects; return newPattern.HitObjects;
} }
/// <summary> /// <summary>