refactors entity spawning

src/map_builders/simple_map.rs

@@ -11,17 +11,13 @@ pub struct SimpleMapBuilder {
     depth: i32,
     rooms: Vec<Rect>,
     history: Vec<Map>,
+    spawn_list: Vec<(usize, String)>,
 }
 
 impl MapBuilder for SimpleMapBuilder {
     fn build_map(&mut self, rng: &mut RandomNumberGenerator) {
         return self.rooms_and_corridors(rng);
     }
-    fn spawn_entities(&mut self, ecs: &mut World) {
-        for room in self.rooms.iter().skip(1) {
-            spawner::spawn_room(ecs, room, self.depth);
-        }
-    }
     //  Getters
     fn get_map(&mut self) -> Map {
         return self.map.clone();
@@ -29,6 +25,9 @@ impl MapBuilder for SimpleMapBuilder {
     fn get_starting_pos(&mut self) -> Position {
         return self.starting_position.clone();
     }
+    fn get_spawn_list(&self) -> &Vec<(usize, String)> {
+        return &self.spawn_list;
+    }
     // Mapgen visualisation stuff
     fn get_snapshot_history(&self) -> Vec<Map> {
         return self.history.clone();
@@ -52,6 +51,7 @@ impl SimpleMapBuilder {
             depth: new_depth,
             rooms: Vec::new(),
             history: Vec::new(),
+            spawn_list: Vec::new(),
         }
     }
 
@@ -99,5 +99,10 @@ impl SimpleMapBuilder {
 
         let start_pos = self.rooms[0].centre();
         self.starting_position = Position { x: start_pos.0, y: start_pos.1 };
+
+        // Spawn entities
+        for room in self.rooms.iter().skip(1) {
+            spawner::spawn_room(&self.map, rng, room, self.depth, &mut self.spawn_list);
+        }
     }
 }