1 files changed, 17 insertions, 18 deletions

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <list>
+#include <map>
 
 class Entity;
 
@@ -23,25 +24,31 @@ class Map {
       ReverseWarp
     };
     
+    enum class MoveDir {
+      Left,
+      Right,
+      Up,
+      Down
+    };
+    
     struct EntityData {
       std::string name;
       std::pair<int, int> position;
     };
     
+    struct Adjacent {
+      MoveType type = MoveType::Wall;
+      int map = -1;
+    };
+    
     static MoveType moveTypeForShort(std::string str);
+    static MoveDir moveDirForShort(std::string str);
     static bool moveTypeTakesMap(MoveType type);
     
     int getID() const;
     const int* getMapdata() const;
     std::string getTitle() const;
-    MoveType getLeftMoveType() const;
-    MoveType getRightMoveType() const;
-    MoveType getUpMoveType() const;
-    MoveType getDownMoveType() const;
-    int getLeftMapID() const;
-    int getRightMapID() const;
-    int getUpMapID() const;
-    int getDownMapID() const;
+    const Adjacent& getAdjacent(MoveDir dir) const;
     
     void createEntities(std::list<std::shared_ptr<Entity>>& entities) const;
     bool operator==(const Map& other) const;
@@ -49,22 +56,14 @@ class Map {
     
     void setMapdata(int* mapdata);
     void setTitle(std::string title);
-    void setLeftMoveType(MoveType type);
-    void setRightMoveType(MoveType type);
-    void setUpMoveType(MoveType type);
-    void setDownMoveType(MoveType type);
-    void setLeftMapID(int id);
-    void setRightMapID(int id);
-    void setUpMapID(int id);
-    void setDownMapID(int id);
+    void setAdjacent(MoveDir dir, MoveType type, int map);
     void addEntity(EntityData& data);
   private:
     int* mapdata;
     std::string title;
     int id;
     std::list<EntityData> entities;
-    MoveType leftType, rightType, upType, downType;
-    int leftMap, rightMap, upMap, downMap;
+    std::map<MoveDir, Adjacent> adjacents;
 };
 
 #endif