X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=c4cd191dfb450f59ca1c3552f49a30e7da93c43f;hb=92159c1baca21e61dd975708e9f1bfef5c357f4b;hp=5cd4f1cf1735d03dd01b8ce2022a66a4453345ff;hpb=cb813c605876f11ce54bee2b44a33e97b00dcf16;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 5cd4f1cf..c4cd191d 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -11,6 +11,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) {
 	int i, j, k;
+	bitmap_t bp;
 	if (count == 0) {
 		return 0;
 	}
@@ -18,36 +19,56 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 	if (t->type == JSMN_PRIMITIVE) {
 		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); }
-			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]);
-		}else if(js_sv == "height")
+			/*
+				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
+			*/
+			map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10);
+//			printf("%d[%d]", q, map->data[q]);
+		}
+		else
+		if(js_sv == "height")
 		{
+			//map->height = (int)malloc(sizeof(int));
 			map->height = (int)strtol(js+t->start, (char **)js+t->end, 10);
 			//printf("h:[%d]\n", map->height);
 		}else if(js_sv == "width")
 		{
 			map->width = (int)strtol(js+t->start, (char **)js+t->end, 10);
-			//printf("w:[%d]\n", map->width);
+//			printf("w:[%d]\n", map->width);
 		}
 		return 1;
 		/* We may use strndup() to fetch string value */
 	} else if (t->type == JSMN_STRING) {
-		//printf("'%.*s'", t->end - t->start, js+t->start);
-		if (jsoneq(js, t, "data") == 0)
+		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));
+			//map->tiles->data = malloc(sizeof(bitmap_t));
+			//fix this
+			bp = bitmapLoadPcx("data/ed.pcx");
+			map->tiles->data = &bp;
+			//map->tiles->data->data = malloc((16/**2*/)*16);
+			//map->tiles->data->width = (16/**2*/);
+			//map->tiles->data->height= 16;
+			map->tiles->tileHeight = 16;
+			map->tiles->tileWidth = 16;
+			map->tiles->rows = 1;
+			map->tiles->cols = 1;
 			js_sv="data";//strdup(js+t->start);//, t->end - t->start);
-			//printf("%s\n", js_sv);
-		}else if (jsoneq(js, t, "height") == 0 && indent==1)
+		}
+		else
+		if (jsoneq(js, t, "height") == 0 && indent==1)
 		{
 			js_sv="height";//strdup(js+t->start);//, t->end - t->start);
-			//printf("%s\n", js_sv);
 		}else if (jsoneq(js, t, "width") == 0 && indent==1)
 		{
 			js_sv="width";//strdup(js+t->start);//, t->end - t->start);
-			//printf("%s\n", js_sv);
 		}else js_sv=NULL;
 		return 1;
 	} else if (t->type == JSMN_OBJECT) {
@@ -65,7 +86,6 @@ 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++) {
-			//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);
@@ -76,7 +96,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 	return 0;
 }
 
-int loadmap(char *mn, map_t *map)
+static int loadmap(char *mn, map_t *map)
 {
 	int r;
 	int eof_expected = 0;
@@ -118,7 +138,7 @@ int loadmap(char *mn, map_t *map)
 
 		js = realloc(js, jslen + r + 1);
 		if (js == NULL) {
-			fprintf(stderr, "realloc(): errno=%d\n", errno);
+			fprintf(stderr, "realloc(): errno = %d\n", errno);
 			return 3;
 		}
 		strncpy(js + jslen, buf, r);
@@ -138,18 +158,13 @@ again:
 			}
 		} else {
 			dump(js, tok, p.toknext, 0, map, 0);
-			//fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok));
-			//printf("[\n%d\n]", jslen);
 			eof_expected = 1;
 		}
 	}
 
-	return 0;
-}
+	free(js);
+	free(tok);
+	fclose(fh);
 
-/*int main()
-{
-	map_t map;
-	loadmap("../../../../data/test.map", &map);
 	return 0;
-}*/
+}