X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=e3f40b441bbee036658cc132a5a95a89d4a28a17;hb=9ada0e848c6a1a951a4325d66532282e00238d17;hp=aa9761ec623d25ce7c35cd46604c96eef6dc4ddb;hpb=2bab9c38c2b93c18474dd9189f1801eb13508a5e;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index aa9761ec..e3f40b44 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,6 +1,6 @@
 #include "src/lib/mapread.h"
 
-int jsoneq(const char /*far*/ *json, jsmntok_t /*far*/ *tok, const char *s) {
+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) {
 		return 0;
@@ -9,8 +9,9 @@ int jsoneq(const char /*far*/ *json, jsmntok_t /*far*/ *tok, const char *s) {
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
-	int i, j, k;
+word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q) {
+	dword i;
+	word j;//, k;
 	bitmap_t bp;
 	#ifdef DEBUG_JS
 	if(indent==0)
@@ -20,6 +21,8 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 	}
 	#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,6 +30,7 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		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"))
 		{
@@ -37,7 +41,6 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 
 				FUCK well i am stuck.... wwww
 			*/
-//----			map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
 			map->data[q] = (byte)atoi(js+t->start);
 			#ifdef DEBUG_MAPDATA
 				fprintf(stdout, "%d[%d]", q, map->data[q]);
@@ -46,16 +49,14 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		else
 		if(strstr(js_sv, "height"))
 		{
-//----			map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-			map->height = (unsigned int)atoi(js+t->start);
+			map->height = atoi(js+t->start);
 			#ifdef DEBUG_MAPVAR
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "h:[%d]\n", map->height);
 			#endif
 		}else if(strstr(js_sv, "width"))
 		{
-//----			map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-			map->width = (unsigned int)atoi(js+t->start);
+			map->width = atoi(js+t->start);
 			#ifdef DEBUG_MAPVAR
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "w:[%d]\n", map->width);
@@ -68,10 +69,10 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		{
 //			fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
 //			fprintf(stdout, "\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 = /*_f*/malloc(sizeof(byte) * (t+1)->size);
-			map->tiles = /*_f*/malloc(sizeof(tiles_t));
+			map->data = malloc(sizeof(byte) * (t+1)->size);
+			map->tiles = malloc(sizeof(tiles_t));
 			//map->tiles->data = malloc(sizeof(bitmap_t));
-			//fix this
+			//fix this to be far~
 			bp = bitmapLoadPcx("data/ed.pcx");
 			map->tiles->data = &bp;
 			//map->tiles->data->data = malloc((16/**2*/)*16);
@@ -87,7 +88,8 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		if (jsoneq(js, t, "height") == 0 && indent<=1)
 		{
 			strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
-		}else if(jsoneq(js, t, "width") == 0 && indent<=1)
+		}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");
@@ -120,15 +122,16 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 int loadmap(char *mn, map_t *map)
 {
 	int r;
-	static int incr=0;
+	static word incr=0;
 	int eof_expected = 0;
-	char /*far*/ *js = NULL;
+	char *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
+//----	char *buff = &buf;
 	static char js_ss[16];
 
 	jsmn_parser p;
-	jsmntok_t /*far*/ *tok;
+	jsmntok_t *tok;
 	size_t tokcount = 2;
 
 	FILE *fh = fopen(mn, "r");
@@ -137,7 +140,8 @@ int loadmap(char *mn, map_t *map)
 	jsmn_init(&p);
 
 	/* Allocate some tokens as a start */
-	tok = /*_f*/malloc(sizeof(*tok) * tokcount);
+//0000fprintf(stderr, "tok malloc\n");
+	tok = malloc(sizeof(*tok) * tokcount);
 	if (tok == NULL) {
 		fprintf(stderr, "malloc(): errno=%d\n", errno);
 		return 3;
@@ -145,6 +149,7 @@ int loadmap(char *mn, map_t *map)
 
 	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);
@@ -158,9 +163,11 @@ int loadmap(char *mn, map_t *map)
 				return 2;
 			}
 		}
-
-		js = /*_f*/realloc(js, jslen + r + 1);
+//0000fprintf(stdout, "r=	[%d]	BUFSIZ=%d\n", r, BUFSIZ);
+//0000fprintf(stderr, "js alloc~\n");
+		js = realloc(js, jslen + r + 1);
 		if (js == NULL) {
+			fprintf(stderr, "*js=%Fp\n", *js);
 			fprintf(stderr, "realloc(): errno = %d\n", errno);
 			return 3;
 		}
@@ -168,11 +175,18 @@ int loadmap(char *mn, map_t *map)
 		jslen = jslen + r;
 
 again:
+//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;
-				tok = /*_f*/realloc(tok, sizeof(*tok) * tokcount);
+//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount);
+				tok = realloc(tok, sizeof(*tok) * tokcount);
 				if (tok == NULL) {
 					fprintf(stderr, "realloc(): errno=%d\n", errno);
 					return 3;
@@ -180,13 +194,27 @@ again:
 				goto again;
 			}
 		} else {
+			//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=[%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;
 		}
 	}
 
-	/*_f*/free(js);
-	/*_f*/free(tok);
+	free(js);
+	free(tok);
 	fclose(fh);
 
 	return 0;