valter/kroz-rs
valter/kroz-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

Reorganize sound code

Browse source
This commit is contained in:
Alex Page 2022-01-27 17:22:14 -05:00
parent 6ce6470236
commit b48684201b
5 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/state.rs
View file

@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
use crate::components::monster::damage_for_kind;
use crate::components::{Monster, Player, Position, Renderable};
use crate::resources::map::TileType;
use crate::resources::{Clock, Map, ShowDebugInfo, SoundEffects, SoundSystem, Stats};
use crate::resources::{Clock, Map, ShowDebugInfo, SoundEffects, SoundOutput, Stats};
use crate::systems::MonsterMotion;
use crate::{constants::*, sidebar};
use bracket_lib::prelude::*;
@ -67,7 +67,7 @@ impl State {
}
VirtualKeyCode::N | VirtualKeyCode::End => self.try_move_player(-1, 1),
VirtualKeyCode::S => {
let mut sound_system = self.ecs.write_resource::<SoundSystem>();
let mut sound_system = self.ecs.write_resource::<SoundOutput>();
let sound_effects = self.ecs.fetch::<SoundEffects>();
sound_system.play_sound(sound_effects.pickup.clone());
}
@ -79,7 +79,7 @@ impl State {
ctx.quit();
}
_ => {
let mut sound_system = self.ecs.write_resource::<SoundSystem>();
let mut sound_system = self.ecs.write_resource::<SoundOutput>();
let sound_effects = self.ecs.fetch::<SoundEffects>();
sound_system.play_sound(sound_effects.bad_key.clone());
}
@ -93,7 +93,7 @@ impl State {
let mut players = self.ecs.write_storage::<Player>();
let mut map = self.ecs.write_resource::<Map>();
let mut stats = self.ecs.write_resource::<Stats>();
let mut sound_system = self.ecs.write_resource::<SoundSystem>();
let mut sound_system = self.ecs.write_resource::<SoundOutput>();
for (player, pos) in (&mut players, &mut positions).join() {
let now = Instant::now();