RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-11 17:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to match base branch.

Browse Source
This commit is contained in:
smoogipooo 2017-05-19 17:51:59 +09:00
parent 0a596ef1e4
commit e76cb4cc31
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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.MathUtils;
using osu.Game.Database;
using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
namespace osu.Game.Rulesets.Mania.Beatmaps
{
@ -83,28 +84,26 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
// Following lines currently commented out to appease resharper
//Patterns.PatternGenerator conversion = null;
Patterns.PatternGenerator conversion = null;
if (distanceData != null)
{
// Slider
}
else if (endTimeData != null)
{
// Spinner
}
conversion = new EndTimeObjectPatternGenerator(random, original, beatmap);
else if (positionData != null)
{
// Circle
}
//if (conversion == null)
return null;
if (conversion == null)
return null;
//Pattern newPattern = conversion.Generate();
//lastPattern = newPattern;
Pattern newPattern = conversion.Generate();
lastPattern = newPattern;
//return newPattern.HitObjects;
return newPattern.HitObjects;
}
/// <summary>