summaryrefslogtreecommitdiff
path: root/src/systems/view.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-04-04 14:01:17 +0200
committertroido <troido@protonmail.com>2020-04-04 14:01:17 +0200
commit2cc5b468cfd4c28bf1ad17ef1b3600c3d42f8b83 (patch)
tree835e67143e56fafef795e320ce8fc5d50cb9cc6c /src/systems/view.rs
parent0b17829846adf9482b460e4cc616382ede1df6dd (diff)
listen to sounds in the world
Diffstat (limited to 'src/systems/view.rs')
-rw-r--r--src/systems/view.rs13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/systems/view.rs b/src/systems/view.rs
index 0ed1cf7..49338ac 100644
--- a/src/systems/view.rs
+++ b/src/systems/view.rs
@@ -3,6 +3,7 @@ use std::collections::{HashSet};
use specs::{
ReadStorage,
+ WriteStorage,
Read,
Write,
System,
@@ -13,7 +14,7 @@ use specs::{
use crate::{
Pos,
Sprite,
- components::{Visible, Player, Position, Inventory, New, Moved, Removed, Health},
+ components::{Visible, Player, Position, Inventory, New, Moved, Removed, Health, Ear},
resources::{Size, Output, Ground},
worldmessages::{WorldMessage, FieldMessage}
};
@@ -34,9 +35,10 @@ impl <'a> System<'a> for View {
ReadStorage<'a, New>,
ReadStorage<'a, Moved>,
ReadStorage<'a, Removed>,
- Read<'a, Ground>
+ Read<'a, Ground>,
+ WriteStorage<'a, Ear>
);
- fn run(&mut self, (entities, positions, inventories, healths, visible, size, players, mut output, new, moved, removed, ground): Self::SystemData) {
+ fn run(&mut self, (entities, positions, inventories, healths, visible, size, players, mut output, new, moved, removed, ground, mut ears): Self::SystemData) {
let mut changed = HashSet::new();
for (pos, _new) in (&positions, &new).join() {
@@ -78,6 +80,11 @@ impl <'a> System<'a> for View {
if let Some(health) = healths.get(ent){
updates.health = Some((health.health, health.maxhealth));
}
+ if let Some(ear) = ears.get_mut(ent){
+ if !ear.sounds.is_empty(){
+ updates.sounds = Some(ear.sounds.drain(..).map(|s| s.as_message()).collect());
+ }
+ }
updates.ground = Some(
ground
.by_height(&pos.pos, &visible, &ent)