Map changing!

Also removed some dependencies on the Renderer. More changes need to be made. Fading to black before the change would be good. And making sure the characters are facing the right direction. Maybe that code shouldn't live in Game, either. Later we also want to combine the tilesets for these two maps (and any others that are on Tanetane).

1 files changed, 6 insertions, 6 deletions

@@ -5,12 +5,9 @@
 #include <string>
 #include <string_view>
 #include <vector>
-#include "renderer.h"
 #include "vector.h"
 #include "step_type.h"
 
-class Renderer;
-
 struct Tile {
   unsigned int id = 0;
   bool flipHorizontal = false;
@@ -38,7 +35,9 @@ struct Trigger {
 class Map {
 public:
 
-  Map(std::string_view filename, Renderer& renderer);
+  explicit Map(std::string_view filename);
+
+  const std::string& getName() const { return filename_; }
 
   const vec2i& getMapSize() const { return mapSize_; }
 
@@ -46,7 +45,7 @@ public:
 
   const std::vector<std::vector<Tile>>& getLayers() const { return layers_; }
 
-  int getTilesetTextureId() const { return tilesetTextureId_; }
+  const std::string& getTilesetFilename() const { return tilesetFilename_; }
 
   int getTilesetColumns() const { return tilesetColumns_; }
 
@@ -62,10 +61,11 @@ public:
 
 private:
 
+  std::string filename_;
   vec2i mapSize_;
   vec2i tileSize_;
   std::vector<std::vector<Tile>> layers_;
-  int tilesetTextureId_;
+  std::string tilesetFilename_;
   int tilesetColumns_;
   std::vector<Prototype> prototypes_;
   std::map<std::string, vec2i> warpPoints_;