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

Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable

Browse Source
This commit is contained in:
smoogipooo 2017-03-20 18:06:00 +09:00
commit 70be33bde0
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Modes.Taiko/Objects/DrumRoll.cs
View File

@ -106,15 +106,5 @@ namespace osu.Game.Modes.Taiko.Objects
first = false; first = false;
} }
} }
public override TaikoHitType Type
{
get
{
SampleType st = Sample?.Type ?? SampleType.None;
return TaikoHitType.DrumRoll | ((st & SampleType.Finish) > 0 ? TaikoHitType.Finisher : TaikoHitType.None);
}
}
} }
} }

2
osu.Game.Modes.Taiko/Objects/DrumRollTick.cs
View File

@ -15,7 +15,5 @@ namespace osu.Game.Modes.Taiko.Objects
/// <para>Half of this value is the hit window of the tick.</para> /// <para>Half of this value is the hit window of the tick.</para>
/// </summary> /// </summary>
public double TickTimeDistance; public double TickTimeDistance;
public override TaikoHitType Type => TaikoHitType.DrumRollTick;
} }
} }