X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=54a33e52212b4aefd604cd3395b38fdb58f650fb;hb=105c6eafc6100077fabc6cec72d124a615ae2f18;hp=32d06c014ea1b3444fd141c6be57056d3bad7e98;hpb=47de84fccfcf27e3cf83004b74eee1215284c5df;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 32d06c01..54a33e52 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,5 +1,54 @@
 #include "src/lib/mapread.h"
 
+/*static void
+initMap(map_t *map, int maps) {
+	// just a place holder to fill out an alternating pattern
+	int x, y;
+	int i;
+	int tile = 1;
+	//if(!isEMS() || !checkEMS())
+		map->tiles = malloc(sizeof(tiles_t));
+	//else
+	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
+
+	// create the tile set
+	//if(!isEMS() || !checkEMS())
+		map->tiles->data = malloc(sizeof(bitmap_t));
+	//else
+	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
+	map->tiles->data->width = (16*2);
+	map->tiles->data->height= 16;
+	//if(!isEMS() || !checkEMS())
+		map->tiles->data->data = malloc((16*2)*16);
+	//else
+	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
+	map->tiles->tileHeight = 16;
+	map->tiles->tileWidth =16;
+	map->tiles->rows = 1;
+	map->tiles->cols = 2;
+
+	//i=0;
+	//for(y=0; y<TILEWH; y++) {
+	//for(x=0; x<(TILEWH*2); x++) {
+	//	if(x<TILEWH)
+	//	  map->tiles->data->data[i] = 28;//0x24;
+	//	else
+	//	  map->tiles->data->data[i] = 0;//0x34;
+	//	i++;
+	//}
+	//}
+
+	i=0;
+	for(y=0; y<map->height; y++) {
+		for(x=0; x<map->width; x++) {
+			map->data[i] = tile;
+			tile = tile ? 0 : 1;
+			i++;
+		}
+		tile = tile ? 0 : 1;
+	}
+}*/
+
 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) {
@@ -9,7 +58,7 @@ static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, word w*/) {
+static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int w*/) {
 	int i, j, k;
 	if (count == 0) {
 		return 0;
@@ -19,8 +68,17 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		//if(w)
 		if(js_sv == "data")
 		{
-			//bgdata[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
-			if(strtol(js+t->start, (char **)js+t->end, 10)==0){ fprintf(stderr, "FACK! %d\n", errno); exit(-1); }
+			/*
+				here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
+				so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return
+				here to read the data.... That is my design for this... wwww
+
+				FUCK well i am stuck.... wwww
+			*/
+			//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); */}
 			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]);
@@ -42,6 +100,8 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		//if(w)
 		if(jsoneq(js, t, "data") == 0 )
 		{
+			//initMap(&map);
+			//map->tiles->data->data = malloc((16*2)*16);
 			js_sv="data";//strdup(js+t->start);//, t->end - t->start);
 			//printf("%s\n", js_sv);
 		}
@@ -71,10 +131,11 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		j = 0;
 		//printf("==\n");
 		for (i = 0; i < t->size; i++) {
+			//printf("[[[[%d]]]]\n", t->size);
 			//if(bgdata==NULL) bgdata=malloc(sizeof(char)*t->size);
 			//for (k = 0; k < indent-1; k++) printf("\t");
 			//printf("\t-");
-			j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
+			j += dump(js, t+1+j, count-j, indent+1, map, i/*, t->size*/);
 			//printf("==\n");
 		}
 		return j+1;