From 952ec358571c21bbf2ff84d46065ecc07a55bdff Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Thu, 29 Aug 2019 19:54:53 +0200
Subject: [PATCH] Remove warnings

---
 common/src/sys/movement.rs               |  2 --
 common/src/sys/phys.rs                   |  4 +---
 server/src/cmd.rs                        |  2 --
 voxygen/src/menu/char_selection/scene.rs |  1 -
 voxygen/src/scene/figure.rs              | 11 ++---------
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/common/src/sys/movement.rs b/common/src/sys/movement.rs
index 3acabeb997..d89b89b2c5 100644
--- a/common/src/sys/movement.rs
+++ b/common/src/sys/movement.rs
@@ -15,8 +15,6 @@ pub const ROLL_DURATION: Duration = Duration::from_millis(600);
 
 const HUMANOID_ACCEL: f32 = 70.0;
 const HUMANOID_SPEED: f32 = 120.0;
-const WIELD_ACCEL: f32 = 70.0;
-const WIELD_SPEED: f32 = 120.0;
 const HUMANOID_AIR_ACCEL: f32 = 10.0;
 const HUMANOID_AIR_SPEED: f32 = 100.0;
 const ROLL_SPEED: f32 = 13.0;
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index cd16ee87a3..42ebc978c5 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -273,9 +273,7 @@ impl<'a> System<'a> for Sys {
         }
 
         // Apply pushback
-        for (pos, scale, mut vel, _) in
-            (&positions, scales.maybe(), &mut velocities, &bodies).join()
-        {
+        for (pos, scale, vel, _) in (&positions, scales.maybe(), &mut velocities, &bodies).join() {
             let scale = scale.map(|s| s.0).unwrap_or(1.0);
             for (pos_other, scale_other, _) in (&positions, scales.maybe(), &bodies).join() {
                 let scale_other = scale_other.map(|s| s.0).unwrap_or(1.0);
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 4c4e662505..33733b9b26 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -10,8 +10,6 @@ use common::{
     msg::ServerMsg,
     npc::{get_npc_name, NpcKind},
     state::TimeOfDay,
-    terrain::TerrainChunkSize,
-    vol::VolSize,
 };
 use rand::Rng;
 use specs::{Builder, Entity as EcsEntity, Join};
diff --git a/voxygen/src/menu/char_selection/scene.rs b/voxygen/src/menu/char_selection/scene.rs
index aae6ca4b20..ea57582854 100644
--- a/voxygen/src/menu/char_selection/scene.rs
+++ b/voxygen/src/menu/char_selection/scene.rs
@@ -145,7 +145,6 @@ impl Scene {
             .figure_model_cache
             .get_or_create_model(
                 renderer,
-                &client.entity(),
                 Body::Humanoid(body),
                 Some(equipment),
                 client.get_tick(),
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index 6cb091334f..4c457d93a6 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -48,7 +48,6 @@ impl FigureModelCache {
     pub fn get_or_create_model(
         &mut self,
         renderer: &mut Renderer,
-        entity: &EcsEntity,
         body: Body,
         equipment: Option<&Equipment>,
         tick: u64,
@@ -675,7 +674,7 @@ impl FigureMgr {
 
             let skeleton_attr = &self
                 .model_cache
-                .get_or_create_model(renderer, &entity, *body, stats.map(|s| &s.equipment), tick)
+                .get_or_create_model(renderer, *body, stats.map(|s| &s.equipment), tick)
                 .1;
 
             match body {
@@ -928,13 +927,7 @@ impl FigureMgr {
             } {
                 let model = &self
                     .model_cache
-                    .get_or_create_model(
-                        renderer,
-                        &entity,
-                        *body,
-                        stats.map(|s| &s.equipment),
-                        tick,
-                    )
+                    .get_or_create_model(renderer, *body, stats.map(|s| &s.equipment), tick)
                     .0;
 
                 // Don't render the player's body while in first person mode