From b1a1cdde34049c8f06b789aa98c069cd28fe4a6b Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Fri, 15 Oct 2021 12:33:38 +0100 Subject: [PATCH] Fixed 'Empty' collectable sprite --- voxygen/src/hud/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 530756732c..b80108275f 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1689,9 +1689,10 @@ impl Hud { &self.fonts, ) .set(overitem_id, ui_widgets); - } else if let Some(sprite) = block.get_sprite() { + } else if let Some(desc) = block.get_sprite().and_then(|s| get_sprite_desc(s, i18n)) + { overitem::Overitem::new( - get_sprite_desc(sprite, i18n), + desc, overitem::TEXT_COLOR, pos.distance_squared(player_pos), &self.fonts, @@ -4053,8 +4054,9 @@ pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localiz } } -pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) -> Cow { +pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) -> Option> { let i18n_key = match sprite { + SpriteKind::Empty => return None, SpriteKind::Anvil => "hud.crafting.anvil", SpriteKind::Cauldron => "hud.crafting.cauldron", SpriteKind::CookingPot => "hud.crafting.cooking_pot", @@ -4065,7 +4067,7 @@ pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) -> SpriteKind::TanningRack => "hud.crafting.tanning_rack", sprite => return Cow::Owned(format!("{:?}", sprite)), }; - Cow::Borrowed(localized_strings.get(i18n_key)) + Some(Cow::Borrowed(localized_strings.get(i18n_key))) } pub fn get_buff_time(buff: BuffInfo) -> String {