From 051ef61d48414b89a0c8e89feda15484dd307fd9 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 20 Mar 2017 15:28:53 +0900 Subject: [PATCH] Make bashes not use textawesome. --- osu-resources | 2 +- .../Tests/TestCaseTaikoHitObjects.cs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/osu-resources b/osu-resources index 4f9ed4e703..00406e13d1 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 4f9ed4e703777ede98737c7e2af31efa4694c395 +Subproject commit 00406e13d1b15683b3565a126e207b08bca7555f diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs index 3faab717ec..e1c08c8770 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs @@ -5,6 +5,7 @@ using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; using osu.Framework.Screens.Testing; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; @@ -163,26 +164,27 @@ namespace osu.Desktop.VisualTests.Tests /// class BashCirclePiece : CirclePiece { + private Sprite icon; + public BashCirclePiece() { Height = 128; } [BackgroundDependencyLoader] - private void load(OsuColour colours) + private void load(OsuColour colours, TextureStore textures) { AccentColour = colours.YellowDark; + + icon.Texture = textures.Get(@"Play/Taiko/bash-hit-inner"); } protected override Drawable CreateIcon() { - return new TextAwesome + return icon = new Sprite { Anchor = Anchor.Centre, Origin = Anchor.Centre, - - TextSize = 45f, - Icon = FontAwesome.fa_asterisk }; } }