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

Removed a few unnecessary casts.

Browse Source
This commit is contained in:
Sam 2021-09-13 10:41:55 -04:00
parent fec92c3000
commit b26ceb6339
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/hud/group.rs
View File

@ -383,8 +383,7 @@ impl<'a> Widget for Group<'a> {
inventory, health, energy, skill_set, *body, self.msm,
);
let char_name = stats.name.to_string();
let health_perc =
health.current() as f64 / health.base_max().max(health.maximum()) as f64;
let health_perc = health.current() / health.base_max().max(health.maximum());
// change panel positions when debug info is shown
let x = if debug_on { i / 8 } else { i / 12 };
let y = if debug_on { i % 8 } else { i % 12 };
@ -411,7 +410,7 @@ impl<'a> Widget for Group<'a> {
.set(state.ids.member_panels_bg[i], ui);
// Health
Image::new(self.imgs.bar_content)
.w_h(148.0 * health_perc, 22.0)
.w_h(148.0 * f64::from(health_perc), 22.0)
.color(Some(health_col))
.top_left_with_margins_on(state.ids.member_panels_bg[i], 2.0, 2.0)
.set(state.ids.member_health[i], ui);

2
voxygen/src/hud/mod.rs
View File

@ -1120,7 +1120,7 @@ impl Hud {
//self.input = client.read_storage::<comp::ControllerInputs>();
if let Some(health) = healths.get(me) {
// Hurt Frame
let hp_percentage = health.current() as f32 / health.maximum() as f32 * 100.0;
let hp_percentage = health.current() / health.maximum() * 100.0;
if hp_percentage < 10.0 && !health.is_dead {
let hurt_fade =
(self.pulse * (10.0 - hp_percentage as f32) * 0.1/* speed factor */).sin()