h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:42:56 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-03-17 19:25:55 +09:00
parent 39c2703fef
commit e3afa9bf71
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/DrawableBash.cs
View File

@ -10,7 +10,7 @@ using System;
namespace osu.Game.Modes.Taiko.Objects.Drawable
{
public class DrawableBash : DrawableTaikoHitObject<Bash>
public class DrawableBash : DrawableTaikoHitObject
{
/// <summary>
/// A list of keys which this HitObject will accept. These are the standard Taiko keys for now.
@ -23,9 +23,12 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
/// </summary>
private int userHits;
private Bash bash;
public DrawableBash(Bash bash)
: base(bash)
{
this.bash = bash;
}
protected override void CheckJudgement(bool userTriggered)
@ -37,7 +40,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
userHits++;
if (userHits == HitObject.RequiredHits)
if (userHits == bash.RequiredHits)
{
Judgement.Result = HitResult.Hit;
Judgement.Score = TaikoScoreResult.Great;
@ -48,7 +51,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
if (Judgement.TimeOffset < 0)
return;
if (userHits > HitObject.RequiredHits / 2)
if (userHits > bash.RequiredHits / 2)
{
Judgement.Result = HitResult.Hit;
Judgement.Score = TaikoScoreResult.Good;