Merge branch 'master' into catch-banana-shower

This commit is contained in:
Dan Balasescu
2018-01-12 20:00:00 +09:00
committed by GitHub
6 changed files with 28 additions and 15 deletions

View File

@ -40,7 +40,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
protected override void AddNested(DrawableHitObject h)
{
((DrawableCatchHitObject)h).CheckPosition = o => CheckPosition?.Invoke(o) ?? false;
var catchObject = (DrawableCatchHitObject)h;
catchObject.CheckPosition = o => CheckPosition?.Invoke(o) ?? false;
catchObject.AccentColour = HitObject.ComboColour;
dropletContainer.Add(h);
base.AddNested(h);
}