From cd48894563052baeddff64f6bbc13ccc7fa6e081 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 19 Feb 2015 20:10:11 -0500
Subject: Added CRT mesh!

Also a character sprite, changed up the map file format, fixed some shader bugs
---
 src/map.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/map.cpp')

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 @@
 Map::Map(char* filename)
 {
   FILE* f = fopen(filename, "r");
-  m_mapdata = (char*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(char));
   
+  m_mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
   for (int i=0; i<MAP_HEIGHT-1; i++)
   {
-    fread(m_mapdata + i*MAP_WIDTH, sizeof(char), MAP_WIDTH, f);
+    for (int j=0; j<MAP_WIDTH; j++)
+    {
+      fscanf(f, "%d,", &(m_mapdata[i*MAP_WIDTH + j]));
+    }
+    
     fgetc(f);
   }
   
@@ -24,7 +28,7 @@ Map::~Map()
   free(m_title);
 }
 
-const char* Map::mapdata()
+const int* Map::mapdata()
 {
   return m_mapdata;
 }
-- 
cgit 1.4.1