h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 03:22:59 +08:00
Code Issues Releases Wiki Activity

Make compile.

Browse Source
This commit is contained in:
smoogipooo 2017-05-18 12:50:12 +09:00
parent f6dc85c2f8
commit 16eda2467f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Mania/Beatmaps/LegacyConverter.cs
View File

@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
private readonly double lastNoteTime; private readonly double lastNoteTime;
private readonly float lastNotePosition; private readonly float lastNotePosition;
private ObjectRow lastRow = new ObjectRow();
private readonly int availableColumns; private readonly int availableColumns;
private readonly float localXDivisor; private readonly float localXDivisor;
@ -105,7 +107,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
ObjectConversion conversion = null; ObjectConversion conversion = null;
if (distanceData != null) if (distanceData != null)
conversion = new DistanceObjectConversion(distanceData, beatmap); conversion = new DistanceObjectConversion(original, lastRow, random, beatmap);
else if (endTimeData != null) else if (endTimeData != null)
{ {
// Spinner // Spinner
@ -118,8 +120,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
if (conversion == null) if (conversion == null)
yield break; yield break;
foreach (ManiaHitObject obj in conversion.GenerateConversion().HitObjects) ObjectRow newRow = conversion.GenerateConversion();
foreach (ManiaHitObject obj in newRow.HitObjects)
yield return obj; yield return obj;
lastRow = newRow;
} }
private int getColumn(float position) => MathHelper.Clamp((int)Math.Floor(position / localXDivisor), 0, availableColumns - 1); private int getColumn(float position) => MathHelper.Clamp((int)Math.Floor(position / localXDivisor), 0, availableColumns - 1);