Fix post-merge errors.

This commit is contained in:
smoogipooo
2017-03-29 10:59:35 +09:00
parent b54e8356f2
commit 589bdde03c
2 changed files with 8 additions and 6 deletions

View File

@ -44,8 +44,10 @@ namespace osu.Game.Modes.Taiko.Beatmaps
IHasRepeats repeatsData = original as IHasRepeats;
IHasEndTime endTimeData = original as IHasEndTime;
// Old osu! used hit sounding to determine hits
bool strong = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
// Old osu! used hit sounding to determine various hit type information
SampleType sample = original.Sample?.Type ?? SampleType.None;
bool strong = (sample & SampleType.Finish) > 0;
if (distanceData != null)
{
@ -78,7 +80,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
{
StartTime = original.StartTime,
Sample = original.Sample,
IsStrong = strong
IsStrong = strong,
Type = type
};
}