From e1222fdf0291bc25fffe2c11c3e1e395dfdfd497 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Sun, 22 Mar 2020 14:55:08 +0100 Subject: [PATCH] removed warnings and item test values --- common/src/comp/inventory/mod.rs | 58 ++------------------------- voxygen/src/menu/char_selection/ui.rs | 2 +- voxygen/src/scene/figure/load.rs | 1 - 3 files changed, 4 insertions(+), 57 deletions(-) diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 89a382354d..ad2d0f7e53 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -277,62 +277,10 @@ impl Inventory { impl Default for Inventory { fn default() -> Inventory { let mut inventory = Inventory { - slots: vec![None; 45], + slots: vec![None; 18], }; - inventory.push(assets::load_expect_cloned( - "common.items.armor.chest.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.belt.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.foot.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.hand.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.pants.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.shoulder.cloth_blue_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.chest.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.belt.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.foot.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.hand.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.pants.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.shoulder.cloth_green_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.chest.cloth_purple_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.belt.cloth_purple_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.foot.cloth_purple_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.hand.cloth_purple_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.pants.cloth_purple_0", - )); - inventory.push(assets::load_expect_cloned( - "common.items.armor.shoulder.cloth_purple_0", - )); + inventory.push(assets::load_expect_cloned("common.items.cheese")); + inventory.push(assets::load_expect_cloned("common.items.apple")); inventory } } diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 3963298e42..54db12eda6 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -683,7 +683,7 @@ impl CharSelectionUi { Mode::Create { name, body, - loadout, + loadout: _, tool, } => { let mut to_select = false; diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 65b5dff155..a2e51c48ab 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -21,7 +21,6 @@ use common::{ ItemKind, Loadout, }, figure::{DynaUnionizer, MatSegment, Material, Segment}, - vol::SizedVol, }; use dot_vox::DotVoxData; use hashbrown::HashMap;