can now load maps in the same format as the python version

2 files changed, 4 insertions, 4 deletions

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();
diff --git a/src/systems/view.rs b/src/systems/view.rs
index 9ab6faf..fec5ee7 100644
--- a/src/systems/view.rs
+++ b/src/systems/view.rs
@@ -16,7 +16,7 @@ use specs::{
 };
 
 use super::super::pos::Pos;
-use super::super::components::{Visible, Played, Position};
+use super::super::components::{Visible, Player, Position};
 use super::super::resources::{Size, Output};
 use super::super::worldmessages::{WorldMessage, WorldUpdate, FieldMessage};
 
@@ -29,7 +29,7 @@ pub struct View {
 }
 
 impl <'a> System<'a> for View {
-	type SystemData = (ReadStorage<'a, Position>, ReadStorage<'a, Visible>, Read<'a, Size>, WriteStorage<'a, Played>, Write<'a, Output>);
+	type SystemData = (ReadStorage<'a, Position>, ReadStorage<'a, Visible>, Read<'a, Size>, WriteStorage<'a, Player>, Write<'a, Output>);
 	fn run(&mut self, (positions, visible, size, mut players, mut output): Self::SystemData) {
 		
 		let mut cells: HashMap<Pos, Vec<Visible>> = HashMap::new();