modified: scroll.exe

	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h

diff --git a/scroll.exe b/scroll.exe
index cae51f8da4b89f522f1cd26c4b91185b93c53057..5d0ed08c4eb28a47c7bec552110769631e7c2be7 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 54a33e52212b4aefd604cd3395b38fdb58f650fb..432a0cc69b655721916faee8ffeecfced192c33e 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,54 +1,5 @@
 #include "src/lib/mapread.h"
 
-/*static void\r
-initMap(map_t *map, int maps) {\r
-       // just a place holder to fill out an alternating pattern\r
-       int x, y;\r
-       int i;\r
-       int tile = 1;\r
-       //if(!isEMS() || !checkEMS())\r
-               map->tiles = malloc(sizeof(tiles_t));\r
-       //else\r
-       //      map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
-\r
-       // create the tile set\r
-       //if(!isEMS() || !checkEMS())\r
-               map->tiles->data = malloc(sizeof(bitmap_t));\r
-       //else\r
-       //      map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
-       map->tiles->data->width = (16*2);\r
-       map->tiles->data->height= 16;\r
-       //if(!isEMS() || !checkEMS())\r
-               map->tiles->data->data = malloc((16*2)*16);\r
-       //else\r
-       //      map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
-       map->tiles->tileHeight = 16;\r
-       map->tiles->tileWidth =16;\r
-       map->tiles->rows = 1;\r
-       map->tiles->cols = 2;\r
-\r
-       //i=0;\r
-       //for(y=0; y<TILEWH; y++) {\r
-       //for(x=0; x<(TILEWH*2); x++) {\r
-       //      if(x<TILEWH)\r
-       //        map->tiles->data->data[i] = 28;//0x24;\r
-       //      else\r
-       //        map->tiles->data->data[i] = 0;//0x34;\r
-       //      i++;\r
-       //}\r
-       //}\r
-\r
-       i=0;\r
-       for(y=0; y<map->height; y++) {\r
-               for(x=0; x<map->width; x++) {\r
-                       map->data[i] = tile;\r
-                       tile = tile ? 0 : 1;\r
-                       i++;\r
-               }\r
-               tile = tile ? 0 : 1;\r
-       }\r
-}*/
-
 static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
        if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
                        strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
@@ -78,7 +29,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
                        //dump(js, t+1, count, indent, map, i);
                        
                        //bgdata[q] = strtol(js+t->start, (char **)js+t->end, 10);
-                       if(strtol(js+t->start, (char **)js+t->end, 10)==0){ /*printf("%d\n", sizeof(map->tiles->data->data));*/ /*fprintf(stderr, "\nFACK! %d\n", errno);*/ return 1; /*exit(-1); */}
+                       //if(strtol(js+t->start, (char **)js+t->end, 10)==0){ /*printf("%d\n", sizeof(map->tiles->data->data));*/ /*fprintf(stderr, "\nFACK! %d\n", errno);*/ return 1; /*exit(-1); */}
                        map->tiles->data->data[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
                        printf("%d[%d]", q, map->tiles->data->data[q]);
                        //printf("%d[%d]", q, bgdata[q]);

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 91ab7b7ab3073c6f789861c7a529e2eadc6f5c85..8fb767977bec903e68611eb6085d58b317d088f5 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -25,7 +25,6 @@ typedef struct {
        int height;\r
 } map_t;
 
-//static void initMap(map_t *map, int maps);
 static int jsoneq(const char *json, jsmntok_t *tok, const char *s);
 static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int w*/);
 static int loadmap(char *mn, map_t *map/*, word w*/);