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

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 4141d9e1..c98b3eb8 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -77,8 +77,8 @@ word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, cha
 			map->tiles = /*_f*/malloc(sizeof(tiles_t));
 			//map->tiles->data = malloc(sizeof(bitmap_t));
 			//fix this to be far~
-			bp = bitmapLoadPcx("data/ed.pcx");
-			map->tiles->data = &bp;
+//++++			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;
@@ -179,12 +179,13 @@ int loadmap(char *mn, map_t *map)
 		jslen = jslen + r;
 
 again:
-//fprintf(stdout, "	parse~ tok=%zu	jslen=%zu	r=%d	_memavl()=%u	BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);
-fprintf(stdout, "p=[%u]	[%u]	[%d]\n", p.pos, p.toknext, p.toksuper);
+//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
 */
-//0000		r = jsmn_parse(&p, js, jslen, tok, tokcount);
+//++++		
+		r = jsmn_parse(&p, js, jslen, tok, tokcount);
 //0000fprintf(stdout, "r=	[%d]\n", r);
 		if (r < 0) {
 			if (r == JSMN_ERROR_NOMEM) {
@@ -212,7 +213,8 @@ fprintf(stdout, "p=[%u]	[%u]	[%d]\n", p.pos, p.toknext, p.toksuper);
 			#ifdef DEBUG_DUMPVARS
 			fprintf(stdout, "running dump~\n");
 			#endif
-//0000			dump(js, tok, p.toknext, incr, &js_ss, map, 0);
+//++++
+			dump(js, tok, p.toknext, incr, &js_ss, map, 0);
 			eof_expected = 1;
 		}
 	}