1 files changed, 5 insertions, 7 deletions

@@ -4,8 +4,9 @@
 #include <set>
 #include <range/v3/all.hpp>
 #include <vector>
-#include <tileson.hpp>
+#include <memory>
 #include "sprite.h"
+#include "map.h"
 
 struct Input {
   bool left = false;
@@ -55,18 +56,15 @@ public:
     }
   }
 
-  void loadMapFromFile(std::string_view filename) {
-    tson::Tileson t;
-    map_ = t.parse(fs::path(filename));
-  }
+  void setMap(std::unique_ptr<Map> map) { map_ = std::move(map); }
 
-  tson::Map* getMap() const { return map_.get(); }
+  const Map& getMap() const { return *map_; }
 
 private:
 
   std::vector<Sprite> sprites_;
   std::set<std::tuple<int, int>> spritesByY_;
-  std::unique_ptr<tson::Map> map_;
+  std::unique_ptr<Map> map_;
 };
 
 #endif /* end of include guard: GAME_H_E6F1396E */