RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to solve warnings...

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