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-09-26 18:48:37 +02:00
parent ab634f1d21
commit fe17b4952c
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
3 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/projectile.rs
View File

@ -1,4 +1,4 @@
use specs::{Component, FlaggedStorage, NullStorage};
use specs::{Component, FlaggedStorage};
use specs_idvs::IDVStorage;
#[derive(Clone, Debug, Serialize, Deserialize)]

20
common/src/sys/combat.rs
View File

@ -1,7 +1,5 @@
use crate::{
comp::{
ActionState::*, CharacterState, Controller, ForceUpdate, HealthSource, Ori, Pos, Stats, Vel,
},
comp::{ActionState::*, CharacterState, Controller, HealthSource, Ori, Pos, Stats},
event::{EventBus, LocalEvent, ServerEvent},
state::{DeltaTime, Uid},
};
@ -21,9 +19,6 @@ const BLOCK_EFFICIENCY: f32 = 0.9;
const ATTACK_RANGE: f32 = 4.0;
const BLOCK_ANGLE: f32 = 180.0;
const KNOCKBACK_XY: f32 = 2.0;
const KNOCKBACK_Z: f32 = 2.0;
/// This system is responsible for handling accepted inputs like moving or attacking
pub struct Sys;
impl<'a> System<'a> for Sys {
@ -36,10 +31,8 @@ impl<'a> System<'a> for Sys {
ReadStorage<'a, Pos>,
ReadStorage<'a, Ori>,
ReadStorage<'a, Controller>,
WriteStorage<'a, Vel>,
WriteStorage<'a, CharacterState>,
WriteStorage<'a, Stats>,
WriteStorage<'a, ForceUpdate>,
);
fn run(
@ -53,14 +46,12 @@ impl<'a> System<'a> for Sys {
positions,
orientations,
controllers,
mut velocities,
mut character_states,
mut stats,
mut force_updates,
stats,
): Self::SystemData,
) {
let mut server_emitter = server_bus.emitter();
let mut local_emitter = local_bus.emitter();
let mut _local_emitter = local_bus.emitter();
// Attacks
for (entity, uid, pos, ori, _) in
@ -87,14 +78,13 @@ impl<'a> System<'a> for Sys {
if deal_damage {
if let Some(Attack { .. }) = &character_states.get(entity).map(|c| c.action) {
// Go through all other entities
for (b, uid_b, pos_b, ori_b, character_b, mut vel_b, stat_b) in (
for (b, uid_b, pos_b, ori_b, character_b, stat_b) in (
&entities,
&uids,
&positions,
&orientations,
&character_states,
&mut velocities,
&mut stats,
&stats,
)
.join()
{

21
common/src/sys/projectile.rs
View File

@ -1,53 +1,37 @@
use crate::{
comp::{
projectile, ActionState::*, CharacterState, Controller, ForceUpdate, HealthSource, Ori,
PhysicsState, Pos, Projectile, Stats, Vel,
},
comp::{projectile, HealthSource, Ori, PhysicsState, Projectile, Vel},
event::{EventBus, ServerEvent},
state::{DeltaTime, Uid},
};
use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
use std::time::Duration;
use vek::*;
/// This system is responsible for handling projectile effect triggers
pub struct Sys;
impl<'a> System<'a> for Sys {
type SystemData = (
Entities<'a>,
ReadStorage<'a, Uid>,
Read<'a, DeltaTime>,
Read<'a, EventBus<ServerEvent>>,
ReadStorage<'a, Pos>,
ReadStorage<'a, Vel>,
ReadStorage<'a, PhysicsState>,
WriteStorage<'a, Ori>,
WriteStorage<'a, Projectile>,
WriteStorage<'a, Stats>,
);
fn run(
&mut self,
(
entities,
uids,
dt,
server_bus,
positions,
velocities,
physics_states,
mut orientations,
mut projectiles,
mut stats,
): Self::SystemData,
) {
let mut server_emitter = server_bus.emitter();
// Attacks
for (entity, uid, pos, vel, physics, ori, projectile) in (
for (entity, vel, physics, ori, projectile) in (
&entities,
&uids,
&positions,
&velocities,
&physics_states,
&mut orientations,
@ -84,7 +68,6 @@ impl<'a> System<'a> for Sys {
entity,
cause: HealthSource::World,
}),
_ => {}
}
}
}