diff --git a/assets/voxygen/element/map/excl.png b/assets/voxygen/element/map/excl.png new file mode 100644 index 0000000000..376deeabd7 Binary files /dev/null and b/assets/voxygen/element/map/excl.png differ diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 1d4cc01cfc..f10c028252 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -364,6 +364,7 @@ image_ids! { mmap_site_cave_bg: "voxygen.element.map.cave_bg", mmap_site_cave_hover: "voxygen.element.map.cave_hover", mmap_site_cave: "voxygen.element.map.cave", + mmap_site_excl: "voxygen.element.map.excl", // Window Parts window_3: "voxygen.element.frames.window_3", diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs index d22d920408..b31720d8b9 100644 --- a/voxygen/src/hud/map.rs +++ b/voxygen/src/hud/map.rs @@ -528,6 +528,7 @@ impl<'a> 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)