X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=c98b3eb84aad6e81f90f756521e6603063855159;hb=af875dfcdc2c548fe4e44a68c54d8bf34fd17480;hp=9a1c3dbfcb29b274de43341ce56318bff30b9af1;hpb=312a36372b6826ad9c6296e17a2586d11355c6b3;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 9a1c3dbf..c98b3eb8 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,16 +1,17 @@
 #include "src/lib/mapread.h"
 
-int jsoneq(const char huge *json, jsmntok_t huge *tok, const char *s) {
-	if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-			strncmp((char const near *)json + tok->start, s, tok->end - tok->start) == 0) {
+int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s) {
+	if (tok->type == JSMN_STRING && (int)_fstrlen(s) == tok->end - tok->start &&
+			_fstrncmp((char const *)json + tok->start, s, tok->end - tok->start) == 0) {
 		return 0;
 	}
 	return -1;
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
-	int i, j, k;
+word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, char *js_sv, map_t *map, unsigned long q) {
+	unsigned long i;
+	word j;//, k;
 	bitmap_t bp;
 	#ifdef DEBUG_JS
 	if(indent==0)
@@ -20,6 +21,8 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 	}
 	#endif
 	#ifdef DEBUG_DUMPVARS
+	fprintf(stdout, "t->size=[%d]	", t->size);
+	fprintf(stdout, "q=[%d]	", q);
 	fprintf(stdout, "indent= [%d]	", indent);
 	fprintf(stdout, "js_sv= [%s]\n", js_sv);
 	#endif
@@ -27,8 +30,9 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 		return 0;
 	}
 	/* We may want to do strtol() here to get numeric value */
+//0000fprintf(stderr, "t->type=%d\n", t->type);
 	if (t->type == JSMN_PRIMITIVE) {
-		if(strstr(js_sv, "data"))
+		if(_fstrstr(js_sv, "data"))
 		{
 			/*
 				here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
@@ -44,7 +48,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			#endif
 		}
 		else
-		if(strstr(js_sv, "height"))
+		if(_fstrstr(js_sv, "height"))
 		{
 //----			map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
 			map->height = atoi((const char *)js+t->start);
@@ -52,7 +56,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "h:[%d]\n", map->height);
 			#endif
-		}else if(strstr(js_sv, "width"))
+		}else if(_fstrstr(js_sv, "width"))
 		{
 //----			map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
 			map->width = atoi((const char *)js+t->start);
@@ -72,9 +76,9 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			//map->data = malloc(sizeof(byte) * (t+1)->size);
 			map->tiles = /*_f*/malloc(sizeof(tiles_t));
 			//map->tiles->data = malloc(sizeof(bitmap_t));
-			//fix this
-			bp = bitmapLoadPcx("data/ed.pcx");
-			map->tiles->data = &bp;
+			//fix this to be far~
+//++++			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;
@@ -82,17 +86,17 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			map->tiles->tileWidth = 16;
 			map->tiles->rows = 1;
 			map->tiles->cols = 1;
-			strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
+			_fstrcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
 		}
 		else
 		if (jsoneq(js, t, "height") == 0 && indent<=1)
 		{
-			strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
+			_fstrcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
 		}else
 		if(jsoneq(js, t, "width") == 0 && indent<=1)
 		{
-			strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
-		}else strcpy(js_sv, "\0");
+			_fstrcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
+		}else _fstrcpy(js_sv, "\0");
 		return 1;
 	} else if (t->type == JSMN_OBJECT) {
 		//fprintf(stdout, "\n");
@@ -122,13 +126,12 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 int loadmap(char *mn, map_t *map)
 {
 	int r;
-	static int incr=0;
+	static word incr=0;
 	int eof_expected = 0;
-	//char *jz = NULL;
 	char huge *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
-	char huge *buff = (char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//(char huge *)FP_OFF(&buf);
+	char huge *buff = &buf;
 	static char js_ss[16];
 
 	jsmn_parser p;
@@ -141,16 +144,16 @@ int loadmap(char *mn, map_t *map)
 	jsmn_init(&p);
 
 	/* Allocate some tokens as a start */
+//0000fprintf(stderr, "tok malloc\n");
 	tok = _fmalloc(sizeof(*tok) * tokcount);
 	if (tok == NULL) {
 		fprintf(stderr, "malloc(): errno=%d\n", errno);
 		return 3;
 	}
 
-	//buff = _fmalloc(sizeof(buf));
-
 	for (;;) {
 		/* Read another chunk */
+//0000fprintf(stderr, "read\n");
 		r = fread(buf, 1, sizeof(buf), fh);
 		if (r < 0) {
 			fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);
@@ -164,27 +167,30 @@ int loadmap(char *mn, map_t *map)
 				return 2;
 			}
 		}
-		//jz = realloc(jz, jslen + r + 1);
+//0000fprintf(stdout, "r=	[%d]	BUFSIZ=%d\n", r, BUFSIZ);
+//0000fprintf(stderr, "js alloc~\n");
 		js = _frealloc(js, jslen + r + 1);
-		if (/*jz == NULL || */js == NULL) {
+		if (js == NULL) {
 			fprintf(stderr, "*js=%Fp\n", *js);
-			//fprintf(stderr, "*jz=%Fp\n", *jz);
 			fprintf(stderr, "realloc(): errno = %d\n", errno);
 			return 3;
 		}
-		//printf("strncpy~\n");
-		//strncpy(jz + jslen, buf, r);
-		_fstrncpy(js + jslen, buff, r);
-		//printf("strncpy okies~~\n");
+		_fstrncpy(js + jslen, &(*buff), r);
 		jslen = jslen + r;
 
 again:
-		//js = (char huge *)*jz;
-		//printf("*js=%s\n", (*js));
+//0000fprintf(stdout, "	parse~ tok=%zu	jslen=%zu	r=%d	_memavl()=%u	BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);
+//0000fprintf(stdout, "p=[%u]	[%u]	[%d]\n", p.pos, p.toknext, p.toksuper);
+/*
+		I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww
+*/
+//++++		
 		r = jsmn_parse(&p, js, jslen, tok, tokcount);
+//0000fprintf(stdout, "r=	[%d]\n", r);
 		if (r < 0) {
 			if (r == JSMN_ERROR_NOMEM) {
 				tokcount = tokcount * 2;
+//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount);
 				tok = _frealloc(tok, sizeof(*tok) * tokcount);
 				if (tok == NULL) {
 					fprintf(stderr, "realloc(): errno=%d\n", errno);
@@ -193,20 +199,29 @@ again:
 				goto again;
 			}
 		} else {
-			printf("&buf=[\n%Fp\n]\n", &buf);
-			printf("&buf_seg=[\n%x\n]\n", FP_SEG(&buf));
-			printf("&buf_off=[\n%x\n]\n", FP_OFF(&buf));
-			printf("&buf_fp=[\n%Fp\n]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
+			//printf("js=%Fp\n", (js));
+			//printf("*js=%Fp\n", (*(js)));
+			printf("&*js=%s\n", &(*(js)));
+			//printf("&buf=[%Fp]\n", &buf);
+			//printf("&buf_seg=[%x]\n", FP_SEG(&buf));
+			//printf("&buf_off=[%x]\n", FP_OFF(&buf));
+			//printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
 			//printf("buf=[\n%s\n]\n", buf);
-			printf("buff=[\n%Fp\n]\n", buff);
-			printf("*buff=[\n%Fp\n]\n", (*buff));
+			//printf("buff=[%Fp]\n", buff);
+			//printf("(*buff)=[%Fp]\n", (*buff));
+			//printf("&(*buff)=[\n%s\n]\n", &(*buff));
+			#ifdef DEBUG_DUMPVARS
+			fprintf(stdout, "running dump~\n");
+			#endif
+//++++
 			dump(js, tok, p.toknext, incr, &js_ss, map, 0);
 			eof_expected = 1;
 		}
 	}
 
-	hfree(js);
-	hfree(tok);
+	_ffree(js);
+	_ffree(buff);
+	_ffree(tok);
 	fclose(fh);
 
 	return 0;