summary refs log tree commit diff stats
path: root/src/map.h
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2015-02-19 20:10:11 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2015-02-19 20:10:11 -0500
commitcd48894563052baeddff64f6bbc13ccc7fa6e081 (patch)
treec7ab2a9b4cbb7ac0d921cf486aef00c5b5623144 /src/map.h
parentc1b1558256997df22678f6405ea320ae454ad5b4 (diff)
downloadtherapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.gz
therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.bz2
therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.zip
Added CRT mesh!
Also a character sprite, changed up the map file format, fixed some shader bugs
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map.h b/src/map.h index 3c09238..2acce59 100644 --- a/src/map.h +++ b/src/map.h
@@ -5,14 +5,14 @@ class Map {
5 public: 5 public:
6 Map(char* filename); 6 Map(char* filename);
7 ~Map(); 7 ~Map();
8 const char* mapdata(); 8 const int* mapdata();
9 const char* title(); 9 const char* title();
10 Map* getLeftMap(); 10 Map* getLeftMap();
11 Map* getRightMap(); 11 Map* getRightMap();
12 void setLeftMap(Map* m); 12 void setLeftMap(Map* m);
13 void setRightMap(Map* m); 13 void setRightMap(Map* m);
14 private: 14 private:
15 char* m_mapdata; 15 int* m_mapdata;
16 char* m_title; 16 char* m_title;
17 Map* m_leftMap = 0; 17 Map* m_leftMap = 0;
18 Map* m_rightMap = 0; 18 Map* m_rightMap = 0;