1 files changed, 63 insertions, 3 deletions

@@ -4,7 +4,6 @@
 #include <vector>
 #include <string>
 #include <list>
-#include <stdexcept>
 #include <map>
 
 class Map {
@@ -44,6 +43,59 @@ public:
     int mapId_;
   };
 
+  class Object {
+  public:
+
+    Object(
+      std::string type,
+      double x,
+      double y,
+      size_t index,
+      std::map<std::string, int> items) :
+        type_(std::move(type)),
+        x_(x),
+        y_(y),
+        index_(index),
+        items_(std::move(items))
+    {
+    }
+
+    inline const std::string& getType() const
+    {
+      return type_;
+    }
+
+    inline double getX() const
+    {
+      return x_;
+    }
+
+    inline double getY() const
+    {
+      return y_;
+    }
+
+    inline size_t getIndex() const
+    {
+      return index_;
+    }
+
+    inline const std::map<std::string, int>& getItems() const
+    {
+      return items_;
+    }
+
+  private:
+
+    std::string type_;
+    double x_;
+    double y_;
+    size_t index_;
+    std::map<std::string, int> items_;
+  };
+
+  using object_storage_type = std::list<Object>;
+
   Map(
     int id,
     std::vector<int> tiles,
@@ -51,14 +103,16 @@ public:
     Adjacent leftAdjacent,
     Adjacent rightAdjacent,
     Adjacent upAdjacent,
-    Adjacent downAdjacent) :
+    Adjacent downAdjacent,
+    object_storage_type objects) :
       id_(id),
       tiles_(std::move(tiles)),
       title_(std::move(title)),
       leftAdjacent_(std::move(leftAdjacent)),
       rightAdjacent_(std::move(rightAdjacent)),
       upAdjacent_(std::move(upAdjacent)),
-      downAdjacent_(std::move(downAdjacent))
+      downAdjacent_(std::move(downAdjacent)),
+      objects_(std::move(objects))
   {
   }
 
@@ -97,6 +151,11 @@ public:
     return downAdjacent_;
   }
 
+  inline const object_storage_type& getObjects() const
+  {
+    return objects_;
+  }
+
 private:
 
   int id_;
@@ -106,6 +165,7 @@ private:
   Adjacent rightAdjacent_;
   Adjacent upAdjacent_;
   Adjacent downAdjacent_;
+  object_storage_type objects_;
 };
 
 #endif /* end of include guard: MAP_H_74055FC0 */