summary refs log tree commit diff stats
path: root/src/map.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map.h b/src/map.h index a562bec..3b3d42c 100644 --- a/src/map.h +++ b/src/map.h
@@ -9,17 +9,17 @@ class Entity;
9class Map { 9class Map {
10 public: 10 public:
11 Map(); 11 Map();
12 Map(const std::string name); 12 Map(std::string name);
13 Map(const Map& map); 13 Map(const Map& map);
14 Map(Map&& map); 14 Map(Map&& map);
15 ~Map(); 15 ~Map();
16 Map& operator= (Map other); 16 Map& operator= (Map other);
17 friend void swap(Map& first, Map& second); 17 friend void swap(Map& first, Map& second);
18 18
19 static Map& getNamedMap(const std::string name); 19 static Map& getNamedMap(std::string name);
20 20
21 const int* getMapdata() const; 21 const int* getMapdata() const;
22 const char* getTitle() const; 22 std::string getTitle() const;
23 const Map* getLeftMap() const; 23 const Map* getLeftMap() const;
24 const Map* getRightMap() const; 24 const Map* getRightMap() const;
25 void setLeftMap(const Map* m); 25 void setLeftMap(const Map* m);
@@ -34,7 +34,7 @@ class Map {
34 }; 34 };
35 35
36 int* mapdata; 36 int* mapdata;
37 char* title; 37 std::string title;
38 std::string name; 38 std::string name;
39 const Map* leftMap = nullptr; 39 const Map* leftMap = nullptr;
40 const Map* rightMap = nullptr; 40 const Map* rightMap = nullptr;