h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:33:30 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
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
};
}

6
osu.Game.Modes.Taiko/TaikoAutoReplay.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Modes.Taiko
IHasEndTime endTimeData = h as IHasEndTime;
double endTime = endTimeData?.EndTime ?? h.StartTime;
Bash sp = h as Bash;
Swell sp = h as Swell;
if (sp != null)
{
int d = 0;
@ -86,14 +86,14 @@ namespace osu.Game.Modes.Taiko
if (hit.Type == HitType.Centre)
{
if (h.Accented)
if (h.IsStrong)
button = LegacyButtonState.Right1 | LegacyButtonState.Right2;
else
button = hitButton ? LegacyButtonState.Right1 : LegacyButtonState.Right2;
}
else
{
if (h.Accented)
if (h.IsStrong)
button = LegacyButtonState.Left1 | LegacyButtonState.Left2;
else
button = hitButton ? LegacyButtonState.Left1 : LegacyButtonState.Left2;