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

Fix post-merge errors.

This commit is contained in:
smoogipooo 2017-03-17 19:27:06 +09:00
parent 04bc37b079
commit 7860199fbd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRollTick.cs
View File

@ -7,7 +7,7 @@
namespace osu.Game.Modes.Taiko.Objects.Drawable
{
public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
public class DrawableDrumRollTick : DrawableTaikoHitObject
{
/// <summary>
/// A list of keys which this HitObject will accept. These are the standard Taiko keys for now.
@ -15,9 +15,12 @@ public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
/// </summary>
private List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
private DrumRollTick tick;
public DrawableDrumRollTick(DrumRollTick tick)
: base(tick)
{
this.tick = tick;
}
protected override TaikoJudgementInfo CreateJudgementInfo() => new TaikoDrumRollTickJudgementInfo();
@ -26,12 +29,12 @@ protected override void CheckJudgement(bool userTriggered)
{
if (!userTriggered)
{
if (Judgement.TimeOffset > HitObject.TickTimeDistance / 2)
if (Judgement.TimeOffset > tick.TickTimeDistance / 2)
Judgement.Result = Modes.Objects.Drawables.HitResult.Miss;
return;
}
if (Math.Abs(Judgement.TimeOffset) < HitObject.TickTimeDistance / 2)
if (Math.Abs(Judgement.TimeOffset) < tick.TickTimeDistance / 2)
{
Judgement.Result = HitResult.Hit;
Judgement.Score = TaikoScoreResult.Great;