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-23 19:43:00 +09:00
parent 217fd14595
commit 315deb6f12
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs
View File

@ -31,6 +31,10 @@ public DrawableDrumRoll(DrumRoll drumRoll)
}
}
protected override void UpdateState(ArmedState state)
{
}
protected override void CheckJudgement(bool userTriggered)
{
if (userTriggered)

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

@ -26,7 +26,7 @@ public DrawableDrumRollTick(DrumRollTick tick)
this.tick = tick;
}
protected override TaikoJudgementInfo CreateJudgementInfo() => new TaikoDrumRollTickJudgementInfo();
protected override TaikoJudgement CreateJudgement() => new TaikoDrumRollTickJudgement();
protected override void CheckJudgement(bool userTriggered)
{
@ -44,6 +44,10 @@ protected override void CheckJudgement(bool userTriggered)
}
}
protected override void UpdateState(ArmedState state)
{
}
protected override void UpdateScrollPosition(double time)
{
// Drum roll ticks shouldn't move