From c2db40dd6b6d10c5b9e1cf461f7cc2f18cad70bd Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 26 Jan 2022 04:16:02 -0500 Subject: [PATCH] Delete leftover LeftMover from tutorial --- src/components/left_mover.rs | 5 ----- src/components/mod.rs | 2 -- src/main.rs | 7 ++----- src/systems/left_walker.rs | 17 ----------------- src/systems/mod.rs | 2 -- 5 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 src/components/left_mover.rs delete mode 100644 src/systems/left_walker.rs diff --git a/src/components/left_mover.rs b/src/components/left_mover.rs deleted file mode 100644 index c33aa18..0000000 --- a/src/components/left_mover.rs +++ /dev/null @@ -1,5 +0,0 @@ -use specs::prelude::*; -use specs_derive::Component; - -#[derive(Component)] -pub struct LeftMover {} diff --git a/src/components/mod.rs b/src/components/mod.rs index 1087442..f024eb4 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -1,10 +1,8 @@ -pub mod left_mover; pub mod monster; pub mod player; pub mod position; pub mod renderable; -pub use left_mover::LeftMover; pub use monster::Monster; pub use player::Player; pub use position::Position; diff --git a/src/main.rs b/src/main.rs index eee9d3e..04668f8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ pub mod vga_color; use bracket_lib::prelude::*; use components::{ monster::{color_for_kind, glyphs_for_kind, ticks_for_kind, MonsterKind}, - LeftMover, Monster, Player, Position, Renderable, + Monster, Player, Position, Renderable, }; use constants::*; use map::{Map, TileType}; @@ -22,7 +22,7 @@ use sound::SoundSystem; use sound_effects::SoundEffects; use specs::prelude::*; use std::time::{Duration, Instant}; -use systems::{LeftWalker, MonsterMotion}; +use systems::MonsterMotion; use vga_color as vga; struct State { @@ -147,8 +147,6 @@ impl GameState for State { impl State { fn run_systems(&mut self) { - let mut lw = LeftWalker {}; - lw.run_now(&self.ecs); let mut mm = MonsterMotion {}; mm.run_now(&self.ecs); self.ecs.maintain(); @@ -183,7 +181,6 @@ fn main() -> BError { gs.ecs.register::(); gs.ecs.register::(); - gs.ecs.register::(); gs.ecs.register::(); gs.ecs.register::(); diff --git a/src/systems/left_walker.rs b/src/systems/left_walker.rs deleted file mode 100644 index 723d518..0000000 --- a/src/systems/left_walker.rs +++ /dev/null @@ -1,17 +0,0 @@ -use crate::components::{left_mover::LeftMover, position::Position}; -use specs::prelude::*; - -pub struct LeftWalker {} - -impl<'a> System<'a> for LeftWalker { - type SystemData = (ReadStorage<'a, LeftMover>, WriteStorage<'a, Position>); - - fn run(&mut self, (lefty, mut pos): Self::SystemData) { - for (_lefty, pos) in (&lefty, &mut pos).join() { - pos.x -= 1; - if pos.x < 0 { - pos.x = 65; - } - } - } -} diff --git a/src/systems/mod.rs b/src/systems/mod.rs index 0bf9542..ba3c0bc 100644 --- a/src/systems/mod.rs +++ b/src/systems/mod.rs @@ -1,5 +1,3 @@ -pub mod left_walker; pub mod monster_motion; -pub use left_walker::LeftWalker; pub use monster_motion::MonsterMotion;