2 files changed, 24 insertions, 11 deletions
diff --git a/src/systems/makefloor.rs b/src/systems/makefloor.rs
index 209d965..8b550bc 100644
--- a/src/systems/makefloor.rs
+++ b/src/systems/makefloor.rs
@@ -11,17 +11,17 @@ use specs::{
 use super::super::components::Position;
 
 use super::super::resources::{
-	Floor
+	Ground
 };
 
 
 pub struct MakeFloor;
 impl <'a> System<'a> for MakeFloor {
-	type SystemData = (Entities<'a>, Write<'a, Floor>, ReadStorage<'a, Position>);
-	fn run(&mut self, (entities, mut floor, positions): Self::SystemData) {
-		floor.cells.clear();
+	type SystemData = (Entities<'a>, Write<'a, Ground>, ReadStorage<'a, Position>);
+	fn run(&mut self, (entities, mut ground, positions): Self::SystemData) {
+		ground.cells.clear();
 		for (ent, pos) in (&entities, &positions).join() {
-			floor.cells.entry(pos.pos).or_insert(Vec::new()).push(ent);
+			ground.cells.entry(pos.pos).or_insert(Vec::new()).push(ent);
 		}
 	}
 }
diff --git a/src/systems/moving.rs b/src/systems/moving.rs
index 2ea0650..28c3d3f 100644
--- a/src/systems/moving.rs
+++ b/src/systems/moving.rs
@@ -12,7 +12,8 @@ use super::super::pos::Pos;
 use super::super::components::{
 	Controller,
 	Blocking,
-	Position
+	Position,
+	Floor
 };
 
 use super::super::controls::{
@@ -21,27 +22,39 @@ use super::super::controls::{
 
 use super::super::resources::{
 	Size,
-	Floor
+	Ground
 };
 
 
 
 pub struct Move;
 impl <'a> System<'a> for Move {
-	type SystemData = (ReadStorage<'a, Controller>, WriteStorage<'a, Position>, Read<'a, Size>, ReadStorage<'a, Blocking>, Read<'a, Floor>);
-	fn run(&mut self, (controllers, mut positions, size, blocking, floor): Self::SystemData) {
+	type SystemData = (
+		ReadStorage<'a, Controller>,
+		WriteStorage<'a, Position>,
+		Read<'a, Size>,
+		ReadStorage<'a, Blocking>,
+		Read<'a, Ground>,
+		ReadStorage<'a, Floor>,
+	);
+	
+	fn run(&mut self, (controllers, mut positions, size, blocking, ground, floor): Self::SystemData) {
 		for (controller, mut pos) in (&controllers, &mut positions.restrict_mut()).join(){
 			match &controller.0 {
 				Control::Move(direction) => {
 					let newpos = (pos.get_unchecked().pos + direction.to_position()).clamp(Pos::new(0, 0), Pos::new(size.width - 1, size.height - 1));
 					let mut blocked = false;
-					for ent in floor.cells.get(&newpos).unwrap_or(&Vec::new()) {
+					let mut on_floor = false;
+					for ent in ground.cells.get(&newpos).unwrap_or(&Vec::new()) {
 						if blocking.get(*ent).is_some(){
 							blocked = true;
 							break;
 						}
+						if floor.get(*ent).is_some(){
+							on_floor = true;
+						}
 					}
-					if !blocked {
+					if !blocked && on_floor {
 						let mut pos_mut = pos.get_mut_unchecked();
 						pos_mut.prev = Some(pos_mut.pos);
 						pos_mut.pos = newpos.clone();