h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 09:37:23 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-03-24 15:05:54 +09:00
parent ce1257ba56
commit 79fa9daec8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
/// </summary> /// </summary>
private int userHits; private int userHits;
private Bash bash; private readonly Bash bash;
public DrawableBash(Bash bash) public DrawableBash(Bash bash)
: base(bash) : base(bash)
@ -61,6 +61,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
} }
} }
protected override void UpdateState(ArmedState state)
{
}
protected override void UpdateScrollPosition(double time) protected override void UpdateScrollPosition(double time)
{ {
base.UpdateScrollPosition(Math.Min(time, HitObject.StartTime)); base.UpdateScrollPosition(Math.Min(time, HitObject.StartTime));