From c9a11aec577a0927afb4e97f3041b492621ce666 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Sun, 16 Feb 2020 23:25:04 +0100
Subject: added playerid to avoid stringly typing

---
 src/systems/controlinput.rs | 16 ++++++++--------
 src/systems/view.rs         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/systems')

diff --git a/src/systems/controlinput.rs b/src/systems/controlinput.rs
index 608de06..e9b1103 100644
--- a/src/systems/controlinput.rs
+++ b/src/systems/controlinput.rs
@@ -11,10 +11,10 @@ use specs::{
 	Join
 };
 
+use crate::{PlayerId, hashmap};
 use crate::components::{Controller, Player, Removed};
 use crate::controls::{Control, Action};
 use crate::resources::{Input, NewEntities, Spawn};
-use crate::hashmap;
 use crate::template::Template;
 use crate::parameter::Parameter;
 
@@ -41,25 +41,25 @@ impl <'a> System<'a> for ControlInput {
 			}
 		}
 	
-		let mut playercontrols: HashMap<&str, Control> = HashMap::new();
+		let mut playercontrols: HashMap<&PlayerId, Control> = HashMap::new();
 		let mut leaving = HashSet::new();
 		for action in &input.actions {
 			match action {
-				Action::Join(name) => {
+				Action::Join(player) => {
 					new.templates.push((
 						spawn.pos,
-						Template::new("player", hashmap!("name".to_string() => Parameter::String(name.to_string())))
+						Template::new("player", hashmap!("name".to_string() => Parameter::String(player.name.clone()))).unsaved()
 					));
 				}
-				Action::Leave(name) => {leaving.insert(name);}
-				Action::Input(name, control) => {playercontrols.insert(name, control.clone());}
+				Action::Leave(player) => {leaving.insert(player);}
+				Action::Input(player, control) => {playercontrols.insert(player, control.clone());}
 			}
 		}
 		for (player, entity) in (&players, &entities).join() {
-			if let Some(control) = playercontrols.get(player.name.as_str()){
+			if let Some(control) = playercontrols.get(&player.id){
 				let _ = controllers.insert(entity, Controller(control.clone()));
 			}
-			if leaving.contains(&player.name) {
+			if leaving.contains(&player.id) {
 				let _ = removed.insert(entity, Removed);
 			}
 		}
diff --git a/src/systems/view.rs b/src/systems/view.rs
index 2bc971e..c452b2f 100644
--- a/src/systems/view.rs
+++ b/src/systems/view.rs
@@ -11,7 +11,7 @@ use specs::{
 	Entity
 };
 
-use crate::pos::Pos;
+use crate::Pos;
 use crate::components::{Visible, Player, Position, Inventory, New, Moved, Removed, Health};
 use crate::resources::{Size, Output, Ground};
 use crate::worldmessages::{WorldMessage, WorldUpdate, FieldMessage};
@@ -82,7 +82,7 @@ impl <'a> System<'a> for View {
 			}
 			updates.push(WorldUpdate::Pos(pos.pos));
 			let message = WorldMessage{updates};
-			output.output.insert(player.name.clone(), message);
+			output.output.insert(player.id.clone(), message);
 		}
 	}
 }
-- 
cgit