Merge branch 'master' into editor-screen-selection

This commit is contained in:
Dean Herbert
2017-10-01 20:05:49 +08:00
committed by GitHub

View File

@ -55,7 +55,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original); Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original);
// Post processing step to transform hit objects with the same start time into strong hits if (original.BeatmapInfo.RulesetID == 3)
{
// Post processing step to transform mania hit objects with the same start time into strong hits
converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x => converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
{ {
TaikoHitObject first = x.First(); TaikoHitObject first = x.First();
@ -63,6 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
first.IsStrong = true; first.IsStrong = true;
return first; return first;
}).ToList(); }).ToList();
}
return converted; return converted;
} }