summary refs log tree commit diff stats
path: root/src/map.h
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2015-03-10 00:41:59 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2015-03-10 00:41:59 -0400
commit7f0e8c7ef70c62814c274f110367db92f01cbb26 (patch)
tree750bcfec923a826609034ebe9185014521400c68 /src/map.h
parentb53826079429939cdfbda073608cb85be8ba0738 (diff)
downloadtherapy-7f0e8c7ef70c62814c274f110367db92f01cbb26.tar.gz
therapy-7f0e8c7ef70c62814c274f110367db92f01cbb26.tar.bz2
therapy-7f0e8c7ef70c62814c274f110367db92f01cbb26.zip
C++11'd everything!
Also moved location information from physics components into entity.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/map.h b/src/map.h index d7b4ecf..e3d1802 100644 --- a/src/map.h +++ b/src/map.h
@@ -3,9 +3,13 @@
3 3
4class Map { 4class Map {
5 public: 5 public:
6 Map(); 6 Map(const char* filename);
7 Map(char* filename); 7 Map(Map& map);
8 Map(Map&& map);
8 ~Map(); 9 ~Map();
10 Map& operator= (Map other);
11 friend void swap(Map& first, Map& second);
12
9 const int* mapdata(); 13 const int* mapdata();
10 const char* title(); 14 const char* title();
11 Map* getLeftMap(); 15 Map* getLeftMap();
@@ -13,10 +17,12 @@ class Map {
13 void setLeftMap(Map* m); 17 void setLeftMap(Map* m);
14 void setRightMap(Map* m); 18 void setRightMap(Map* m);
15 private: 19 private:
20 Map();
21
16 int* m_mapdata; 22 int* m_mapdata;
17 char* m_title; 23 char* m_title;
18 Map* m_leftMap = 0; 24 Map* m_leftMap;
19 Map* m_rightMap = 0; 25 Map* m_rightMap;
20}; 26};
21 27
22#endif 28#endif