merged Draw into View; renamed Position to Pos

1 files changed, 3 insertions, 9 deletions

diff --git a/src/resources.rs b/src/resources.rs
index dc8f596..35e5bdf 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -2,7 +2,7 @@
 use std::collections::HashMap;
 use specs::Entity;
 
-use super::components::{Position, Visible};
+use super::components::Pos;
 use super::controls::Action;
 use super::assemblages::Assemblage;
 use super::worldmessages::WorldMessage;
@@ -25,17 +25,11 @@ pub struct Size {
 }
 
 #[derive(Default)]
-pub struct TopView {
-	pub cells: HashMap<Position, Vec<Visible>>
-}
-
-
-#[derive(Default)]
 pub struct Floor {
-	pub cells: HashMap<Position, Vec<Entity>>
+	pub cells: HashMap<Pos, Vec<Entity>>
 }
 
 #[derive(Default)]
 pub struct NewEntities {
-	pub assemblages: Vec<(Position, Box<dyn Assemblage>)>
+	pub assemblages: Vec<(Pos, Box<dyn Assemblage>)>
 }