From: sparky4 <sparky4@cock.li>
Date: Tue, 31 Mar 2015 17:10:51 +0000 (-0500)
Subject: 	modified:   data/g.pal
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=e2fca6aa7cef49728cf36768f90b46726c705bbf;p=16.git

	modified:   data/g.pal
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   test2.exe
---

diff --git a/data/g.pal b/data/g.pal
index c5950c49..cf668e35 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/scroll.exe b/scroll.exe
index a77f82a9..71026c78 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index d3fdbdae..319f80fd 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -26,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
 				FUCK well i am stuck.... wwww
 			*/
-			map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10);
+//++++			map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10);
 //			printf("%d[%d]", q, map->data[q]);
 		}
 		else
@@ -46,11 +46,11 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		if(jsoneq(js, t, "data") == 0 )
 		{
 //			printf("[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
-//			printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
-			map->data = malloc(sizeof(byte) * (t+1)->size);
-			map->tiles = malloc(sizeof(tiles_t));
+//++++			printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
+//++++			map->data = malloc(sizeof(byte) * (t+1)->size);
+//++++			map->tiles = malloc(sizeof(tiles_t));
 			//map->tiles->data = malloc(sizeof(bitmap_t));
-			bp = bitmapLoadPcx("data/ed.pcx");
+//++++			bp = bitmapLoadPcx("data/ed.pcx");
 			map->tiles->data = &bp;
 			//map->tiles->data->data = malloc((16/**2*/)*16);
 			//map->tiles->data->width = (16/**2*/);
diff --git a/test2.exe b/test2.exe
index beffe312..0592dc62 100644
Binary files a/test2.exe and b/test2.exe differ