Fix post-merge errors.

This commit is contained in:
smoogipooo 2017-04-01 23:59:44 +09:00
parent b4ed8aeb98
commit 38bbf2ac77
3 changed files with 5 additions and 3 deletions

View File

@ -35,9 +35,9 @@ public override void Reset()
AddStep("Swell", addSwell);
AddStep("Centre", () => addCentreHit(false));
AddStep("Strong Centre", () => addCentreHit(true));
AddButton("Add bar line", addBarLine);
AddStep("Rim", () => addRimHit(false));
AddStep("Strong Rim", () => addRimHit(true));
AddStep("Add bar line", addBarLine);
Add(new Container
{

View File

@ -6,11 +6,13 @@
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing;
using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Objects.Types;
using osu.Game.Modes.Replays;
using osu.Game.Modes.Scoring;
using osu.Game.Modes.Taiko.Beatmaps;
using osu.Game.Modes.Taiko.Judgements;
using osu.Game.Modes.Taiko.Objects;
using osu.Game.Modes.Taiko.Objects.Drawable;
using osu.Game.Modes.Taiko.Replays;
using osu.Game.Modes.Taiko.Scoring;
using osu.Game.Modes.UI;
@ -70,7 +72,7 @@ private void loadBarLines()
{
bool isMajor = currentBeat % (int)current.TimeSignature == 0;
BarLine barLine = new BarLine
var barLine = new BarLine
{
StartTime = time,
};

View File

@ -39,7 +39,7 @@ public class TaikoPlayfield : Playfield<TaikoHitObject, TaikoJudgement>
protected override Container<Drawable> Content => hitObjectContainer;
private readonly Container<HitExplosion> hitExplosionContainer;
private Container<DrawableBarLine> barLineContainer;
private readonly Container<DrawableBarLine> barLineContainer;
private readonly Container<DrawableTaikoJudgement> judgementContainer;
private readonly Container hitObjectContainer;