From 7dd148f8e0b371cb422f14dfe926e98642c41317 Mon Sep 17 00:00:00 2001 From: troido Date: Fri, 7 Feb 2020 19:47:49 +0100 Subject: can now load maps in the same format as the python version --- src/systems/controlinput.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/systems/controlinput.rs') diff --git a/src/systems/controlinput.rs b/src/systems/controlinput.rs index e5f0151..b25c336 100644 --- a/src/systems/controlinput.rs +++ b/src/systems/controlinput.rs @@ -12,7 +12,7 @@ use specs::{ }; use crate::pos::Pos; -use crate::components::{Controller, Played}; +use crate::components::{Controller, Player}; use crate::controls::{Control, Action}; use crate::resources::{Input, NewEntities}; use crate::hashmap; @@ -24,7 +24,7 @@ use crate::parameter::Parameter; pub struct ControlInput; impl <'a> System<'a> for ControlInput { - type SystemData = (Entities<'a>, Read<'a, Input>, WriteStorage<'a, Controller>, ReadStorage<'a, Played>, Write<'a, NewEntities>); + type SystemData = (Entities<'a>, Read<'a, Input>, WriteStorage<'a, Controller>, ReadStorage<'a, Player>, Write<'a, NewEntities>); fn run(&mut self, (entities, input, mut controllers, players, mut new): Self::SystemData) { let mut playercontrols: HashMap<&str, Control> = HashMap::new(); let mut leaving = HashSet::new(); -- cgit