|
@@ -39,16 +39,11 @@ pub struct State {
|
|
|
|
|
|
impl State {
|
|
|
fn run_systems(&mut self) {
|
|
|
- let mut mapindex = MapIndexingSystem {};
|
|
|
- mapindex.run_now(&self.ecs);
|
|
|
- let mut vis = VisibilitySystem {};
|
|
|
- vis.run_now(&self.ecs);
|
|
|
- let mut mob = MonsterAI {};
|
|
|
- mob.run_now(&self.ecs);
|
|
|
- let mut melee = MeleeCombatSystem {};
|
|
|
- melee.run_now(&self.ecs);
|
|
|
- let mut damage = DamageSystem {};
|
|
|
- damage.run_now(&self.ecs);
|
|
|
+ MapIndexingSystem.run_now(&self.ecs);
|
|
|
+ VisibilitySystem.run_now(&self.ecs);
|
|
|
+ MonsterAI.run_now(&self.ecs);
|
|
|
+ MeleeCombatSystem.run_now(&self.ecs);
|
|
|
+ DamageSystem.run_now(&self.ecs);
|
|
|
self.ecs.maintain();
|
|
|
}
|
|
|
}
|
|
@@ -130,7 +125,7 @@ fn main() {
|
|
|
fg: RGB::named(rltk::YELLOW),
|
|
|
bg: RGB::named(rltk::BLACK),
|
|
|
})
|
|
|
- .with(Player {})
|
|
|
+ .with(Player)
|
|
|
.with(Viewshed {
|
|
|
visible_tiles: Vec::new(),
|
|
|
range: 8,
|
|
@@ -178,11 +173,11 @@ fn main() {
|
|
|
range: 8,
|
|
|
dirty: true,
|
|
|
})
|
|
|
- .with(Monster {})
|
|
|
+ .with(Monster)
|
|
|
.with(Name {
|
|
|
name: format!("{} #{}", &name, i),
|
|
|
})
|
|
|
- .with(BlocksTile {})
|
|
|
+ .with(BlocksTile)
|
|
|
.with(CombatStats {
|
|
|
max_hp: 16,
|
|
|
hp: 16,
|