From e4f2c73b85becd280a31a69af6193adc51e5f2f6 Mon Sep 17 00:00:00 2001 From: telastrus <4415544-telastrus@users.noreply.gitlab.com> Date: Tue, 6 Aug 2019 22:26:24 -0400 Subject: [PATCH] undo unnecessary pub mod fixed comments fixed other comment --- common/src/comp/mod.rs | 2 +- common/src/comp/stats.rs | 2 +- common/src/sys/phys.rs | 3 +-- voxygen/src/hud/mod.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/src/comp/mod.rs b/common/src/comp/mod.rs index aed36d9585..bee5458a2c 100644 --- a/common/src/comp/mod.rs +++ b/common/src/comp/mod.rs @@ -8,7 +8,7 @@ mod inventory; mod last; mod phys; mod player; -pub mod stats; +mod stats; mod visual; // Reexports diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs index 87dbfa7412..a6c5d189fc 100644 --- a/common/src/comp/stats.rs +++ b/common/src/comp/stats.rs @@ -6,7 +6,7 @@ use specs_idvs::IDVStorage; pub enum HealthSource { Attack { by: Uid }, // TODO: Implement weapon Suicide, - World, //ZA WARUDO! + World, Revive, Command, LevelUp, diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs index b2267ebcdb..de3045b0a6 100644 --- a/common/src/sys/phys.rs +++ b/common/src/sys/phys.rs @@ -210,10 +210,9 @@ impl<'a> System<'a> for Sys { // When the resolution direction is pointing upwards, we must be on the ground if resolve_dir.z > 0.0 && vel.0.z <= 0.0 { - //check for fall damage + // Check for fall damage let falldmg = (vel.0.z / 1.5 + 6.0) as i32; if falldmg < 0 { - //println!("fall damage: {}", falldmg); stat.health.change_by(falldmg, HealthSource::World); } on_ground = true; diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index f15e559b0d..95ca203571 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -511,7 +511,7 @@ impl Hud { .font_id(self.fonts.opensans) .font_size(14) .set(self.ids.coordinates, ui_widgets); - //Player's velocity + // Player's velocity let velocity_text = match debug_info.velocity { Some(velocity) => format!("Velocity: {:.1}", velocity.0), None => "Player has no Vel component".to_owned(),