From 80454d005a1176d9c9980fb9cc96e6a22e57630d Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 12 Feb 2021 22:59:33 +0100 Subject: [PATCH] PoI icon --- assets/voxygen/element/map/excl.png | Bin 0 -> 10816 bytes voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/map.rs | 6 +++++- voxygen/src/hud/minimap.rs | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/element/map/excl.png diff --git a/assets/voxygen/element/map/excl.png b/assets/voxygen/element/map/excl.png new file mode 100644 index 0000000000000000000000000000000000000000..376deeabd70adf0eb3ffbacdefaa99684280d860 GIT binary patch literal 10816 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 Widget for Map<'a> { SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon, SiteKind::Castle => self.imgs.mmap_site_castle, SiteKind::Cave => self.imgs.mmap_site_cave, + _ => self.imgs.mmap_site_excl, }) .x_y_position_relative_to( state.ids.grid, @@ -540,6 +541,7 @@ impl<'a> Widget for Map<'a> { SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_hover, SiteKind::Castle => self.imgs.mmap_site_castle_hover, SiteKind::Cave => self.imgs.mmap_site_cave_hover, + _ => self.imgs.mmap_site_excl, }) .image_color(UI_HIGHLIGHT_0) .with_tooltip( @@ -560,6 +562,7 @@ impl<'a> Widget for Map<'a> { _ => TEXT_COLOR, }, SiteKind::Cave => TEXT_COLOR, + _ => TEXT_COLOR, }, ); // Only display sites that are toggled on @@ -583,7 +586,8 @@ impl<'a> Widget for Map<'a> { if show_caves { site_btn.set(state.ids.mmap_site_icons[i], ui); } - }, + }, + _ => {site_btn.set(state.ids.mmap_site_icons[i], ui);}, } // Difficulty from 0-6 diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs index 3162bb6681..401f1b88a9 100644 --- a/voxygen/src/hud/minimap.rs +++ b/voxygen/src/hud/minimap.rs @@ -303,6 +303,7 @@ impl<'a> Widget for MiniMap<'a> { SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_bg, SiteKind::Castle => self.imgs.mmap_site_castle_bg, SiteKind::Cave => self.imgs.mmap_site_cave_bg, + _ => self.imgs.mmap_site_excl, }) .x_y_position_relative_to( state.ids.grid, @@ -331,6 +332,7 @@ impl<'a> Widget for MiniMap<'a> { SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon, SiteKind::Castle => self.imgs.mmap_site_castle, SiteKind::Cave => self.imgs.mmap_site_cave, + _ => self.imgs.mmap_site_excl, }) .middle_of(state.ids.mmap_site_icons_bgs[i]) .w_h(20.0, 20.0)