Refactored out the tilemap since it was mostly doing nothing useful.

map.hpp

@@ -10,7 +10,6 @@
 #include "pathing.hpp"
 #include "matrix.hpp"
 #include "constants.hpp"
-#include "tilemap.hpp"
 
 using lighting::LightSource;
 
@@ -25,8 +24,8 @@ class Map {
 public:
   size_t $width;
   size_t $height;
-  TileMap $tiles;
   Matrix $walls;
+  Matrix $tiles;
   Pathing $paths;
   std::vector<Room> $rooms;
   std::vector<Point> $dead_ends;
@@ -36,7 +35,6 @@ public:
   Map(Matrix &walls, Pathing &paths);
 
   Matrix& paths() { return $paths.paths(); }
-  TileMap& tiles() { return $tiles; }
   Matrix& input_map() { return $paths.input(); }
   Matrix& walls() { return $walls; }
   size_t width() { return $width; }
@@ -65,7 +63,8 @@ public:
   void dump(int show_x=-1, int show_y=-1);
   bool INVARIANT();
 
-  void load_tiles();
+  void init_tiles();
+  Matrix& tiles();
   void add_room(Room &room);
   void invert_space();
 };