Merge branch 'skinnable-combo-counter' into skinnable-score-display

This commit is contained in:
Dean Herbert
2020-10-15 17:52:06 +09:00
4 changed files with 9 additions and 17 deletions

View File

@ -324,12 +324,19 @@ namespace osu.Game.Skinning
return null;
}
private const string score_font = "score";
private bool hasScoreFont => this.HasFont(score_font);
public override Drawable GetDrawableComponent(ISkinComponent component)
{
switch (component)
{
case HUDSkinComponent hudComponent:
{
if (!hasScoreFont)
return null;
switch (hudComponent.Component)
{
case HUDSkinComponents.ComboCounter:
@ -337,14 +344,6 @@ namespace osu.Game.Skinning
case HUDSkinComponents.ScoreCounter:
return new LegacyScoreCounter(this);
case HUDSkinComponents.ScoreText:
const string font = "score";
if (!this.HasFont(font))
return null;
return new LegacySpriteText(this, font);
}
return null;