Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove warnings

Browse Source
This commit is contained in:
timokoesters 2019-08-29 19:54:53 +02:00
parent 512d2d9a8e
commit 952ec35857
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
5 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/sys/movement.rs
View File

@ -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;

4
common/src/sys/phys.rs
View File

@ -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);

2
server/src/cmd.rs
View File

@ -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};

1
voxygen/src/menu/char_selection/scene.rs
View File

@ -145,7 +145,6 @@ impl Scene {
.figure_model_cache
.get_or_create_model(
renderer,
&client.entity(),
Body::Humanoid(body),
Some(equipment),
client.get_tick(),

11
voxygen/src/scene/figure.rs
View File

@ -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