summary refs log tree commit diff stats
path: root/src/map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp10
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 @@
4Map::Map(char* filename) 4Map::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
27const char* Map::mapdata() 31const int* Map::mapdata()
28{ 32{
29 return m_mapdata; 33 return m_mapdata;
30} 34}