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 c5950c4..cf668e3 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/scroll.exe b/scroll.exe
index a77f82a..71026c7 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index d3fdbda..319f80f 100644 (file)
--- 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*/);\r

diff --git a/test2.exe b/test2.exe
index beffe31..0592dc6 100644 (file)
Binary files a/test2.exe and b/test2.exe differ