h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 18:42:56 +08:00
Code Issues Releases Wiki Activity

Attempt to solve warnings...

Browse Source
This commit is contained in:
smoogipooo 2017-05-18 18:46:50 +09:00
parent af129b3eab
commit c80e2e8f0a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
yield break; yield break;
} }
IEnumerable<ManiaHitObject> objects = null; IEnumerable<ManiaHitObject> objects;
switch (beatmap.BeatmapInfo.RulesetID) switch (beatmap.BeatmapInfo.RulesetID)
{ {
default: default:
@ -74,7 +74,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
var distanceData = original as IHasDistance; var distanceData = original as IHasDistance;
var positionData = original as IHasPosition; var positionData = original as IHasPosition;
PatternGenerator conversion = null; // Following lines currently commented out to appease resharper
//PatternGenerator conversion = null;
if (distanceData != null) if (distanceData != null)
{ {
@ -89,13 +91,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
// Circle // Circle
} }
if (conversion == null) //if (conversion == null)
return new ManiaHitObject[0]; return null;
Pattern newPattern = conversion.Generate(); //Pattern newPattern = conversion.Generate();
lastPattern = newPattern; //lastPattern = newPattern;
return newPattern.HitObjects; //return newPattern.HitObjects;
} }
/// <summary> /// <summary>
@ -113,6 +115,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
var endTimeData = HitObject as IHasEndTime; var endTimeData = HitObject as IHasEndTime;
var positionData = HitObject as IHasXPosition; var positionData = HitObject as IHasXPosition;
int column = GetColumn(positionData?.X ?? 0);
var pattern = new Pattern(); var pattern = new Pattern();
if (endTimeData != null) if (endTimeData != null)
@ -122,7 +126,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
StartTime = HitObject.StartTime, StartTime = HitObject.StartTime,
Samples = HitObject.Samples, Samples = HitObject.Samples,
Duration = endTimeData.Duration, Duration = endTimeData.Duration,
Column = GetColumn(positionData?.X ?? 0), Column = column,
}); });
} }
else if (positionData != null) else if (positionData != null)
@ -131,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
{ {
StartTime = HitObject.StartTime, StartTime = HitObject.StartTime,
Samples = HitObject.Samples, Samples = HitObject.Samples,
Column = GetColumn(positionData?.X ?? 0) Column = column
}); });
} }