diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
commit | cd48894563052baeddff64f6bbc13ccc7fa6e081 (patch) | |
tree | c7ab2a9b4cbb7ac0d921cf486aef00c5b5623144 /src/map.cpp | |
parent | c1b1558256997df22678f6405ea320ae454ad5b4 (diff) | |
download | therapy-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.cpp')
-rw-r--r-- | src/map.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map.cpp b/src/map.cpp index cb1ce72..5f9e7bd 100644 --- a/src/map.cpp +++ b/src/map.cpp | |||
@@ -4,11 +4,15 @@ | |||
4 | Map::Map(char* filename) | 4 | Map::Map(char* filename) |
5 | { | 5 | { |
6 | FILE* f = fopen(filename, "r"); | 6 | FILE* f = fopen(filename, "r"); |
7 | m_mapdata = (char*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(char)); | ||
8 | 7 | ||
8 | m_mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int)); | ||
9 | for (int i=0; i<MAP_HEIGHT-1; i++) | 9 | for (int i=0; i<MAP_HEIGHT-1; i++) |
10 | { | 10 | { |
11 | fread(m_mapdata + i*MAP_WIDTH, sizeof(char), MAP_WIDTH, f); | 11 | for (int j=0; j<MAP_WIDTH; j++) |
12 | { | ||
13 | fscanf(f, "%d,", &(m_mapdata[i*MAP_WIDTH + j])); | ||
14 | } | ||
15 | |||
12 | fgetc(f); | 16 | fgetc(f); |
13 | } | 17 | } |
14 | 18 | ||
@@ -24,7 +28,7 @@ Map::~Map() | |||
24 | free(m_title); | 28 | free(m_title); |
25 | } | 29 | } |
26 | 30 | ||
27 | const char* Map::mapdata() | 31 | const int* Map::mapdata() |
28 | { | 32 | { |
29 | return m_mapdata; | 33 | return m_mapdata; |
30 | } | 34 | } |