sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Resharper is too smart.

Browse Source
This commit is contained in:
smoogipooo
2017-05-11 22:16:50 +09:00
parent f5399f7f2b
commit 0597a95db0
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using System;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Beatmaps; using osu.Game.Rulesets.Beatmaps;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using OpenTK;
namespace osu.Game.Rulesets.Mania.Beatmaps namespace osu.Game.Rulesets.Mania.Beatmaps
{ {
@ -17,12 +18,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject original, Beatmap beatmap) protected override IEnumerable<ManiaHitObject> ConvertHitObject(HitObject original, Beatmap beatmap)
{ {
int columns = (int)Math.Round(beatmap.BeatmapInfo.Difficulty.CircleSize); int availableColumns = (int)Math.Round(beatmap.BeatmapInfo.Difficulty.CircleSize);
var positionData = original as IHasXPosition; var positionData = original as IHasXPosition;
float localWDivisor = 512.0f / columns; float localWDivisor = 512.0f / availableColumns;
int column = Math.Min((int)Math.Floor(positionData.X / localWDivisor), columns - 1); int column = MathHelper.Clamp((int)Math.Floor((positionData?.X ?? 1) / localWDivisor), 0, availableColumns - 1);
yield return new Note yield return new Note
{ {

10
osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
View File

@ -36,7 +36,11 @@ namespace osu.Game.Rulesets.Mania.UI
var timingSections = new List<TimingSection>(); var timingSections = new List<TimingSection>();
// Construct all the relevant timing sections // Construct all the relevant timing sections
ControlPoint lastTimingChange = null; ControlPoint lastTimingChange = Beatmap.TimingInfo.ControlPoints.FirstOrDefault(t => t.TimingChange);
if (lastTimingChange == null)
throw new Exception("The Beatmap contains no timing points!");
foreach (ControlPoint point in Beatmap.TimingInfo.ControlPoints) foreach (ControlPoint point in Beatmap.TimingInfo.ControlPoints)
{ {
if (point.TimingChange) if (point.TimingChange)
@ -92,10 +96,6 @@ namespace osu.Game.Rulesets.Mania.UI
if (note != null) if (note != null)
return new DrawableNote(note); return new DrawableNote(note);
var holdNote = h as HoldNote;
if (holdNote != null)
return new DrawableHoldNote(holdNote);
return null; return null;
} }