1 files changed, 11 insertions, 5 deletions
diff --git a/src/systems/remove.rs b/src/systems/remove.rs
index 2c531e2..b73a2fb 100644
--- a/src/systems/remove.rs
+++ b/src/systems/remove.rs
@@ -3,25 +3,31 @@ use specs::{
 	ReadStorage,
 	System,
 	Join,
+	Write,
 	Entities
 };
 
-use crate::components::{Removed};
-
+use crate::components::{Removed, Position};
+use crate::resources::Ground;
 
 
 pub struct Remove;
 impl <'a> System<'a> for Remove {
 	type SystemData = (
 		Entities<'a>,
-		ReadStorage<'a, Removed>
+		ReadStorage<'a, Removed>,
+		ReadStorage<'a, Position>,
+		Write<'a, Ground>
 	);
 	
-	fn run(&mut self, (entities, removals): Self::SystemData) {
-		for (ent, _) in (&*entities, &removals).join() {
+	fn run(&mut self, (entities, removals, positions, mut ground): Self::SystemData) {
+		for (ent, _) in (&*entities, &removals, ).join() {
 			if let Err(msg) = entities.delete(ent){
 				println!("{:?}", msg);
 			}
+			if let Some(position) = positions.get(ent) {
+				ground.cells.get_mut(&position.pos).unwrap().remove(&ent);
+			}
 		}
 	}
 }