Merge branch 'master' into catch-autoplay

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

View File

@ -37,13 +37,15 @@ namespace osu.Game.Rulesets.Catch.UI
protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
{
var fruit = h as Fruit;
if (fruit != null)
return new DrawableFruit(fruit);
var stream = h as JuiceStream;
if (stream != null)
return new DrawableJuiceStream(stream);
switch (h)
{
case Fruit fruit:
return new DrawableFruit(fruit);
case JuiceStream stream:
return new DrawableJuiceStream(stream);
case BananaShower banana:
return new DrawableBananaShower(banana);
}
return null;
}