1 files changed, 34 insertions, 14 deletions

@@ -1,21 +1,41 @@
-#ifndef WORLD_H
-#define WORLD_H
+#ifndef WORLD_H_153C698B
+#define WORLD_H_153C698B
 
 #include <map>
+#include <string>
 #include "map.h"
 
 class World {
-  public:
-    World(const char* filename);
-    const Map& getMap(int id) const;
-    const Map& getStartingMap() const;
-    std::pair<int, int> getStartingPosition() const;
-    
-  private:
-    std::map<int, Map> maps;
-    int startMap;
-    int startX;
-    int startY;
+public:
+
+  explicit World(std::string filename);
+
+  inline const Map& getMap(size_t id) const
+  {
+    return maps_.at(id);
+  }
+
+  inline size_t getStartingMapId() const
+  {
+    return startMap_;
+  }
+
+  inline int getStartingX() const
+  {
+    return startX_;
+  }
+
+  inline int getStartingY() const
+  {
+    return startY_;
+  }
+
+private:
+
+  std::map<size_t, Map> maps_;
+  size_t startMap_;
+  int startX_;
+  int startY_;
 };
 
-#endif /* end of include guard: WORLD_H */
+#endif /* end of include guard: WORLD_H_153C698B */