From: sparky4 <sparky4@cock.li>
Date: Tue, 24 Mar 2015 15:41:11 +0000 (-0500)
Subject: 	modified:   makefile
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=cc622af140fa834978eb28b0ee94bb30d5e0e091;p=16.git

	modified:   makefile
	new file:   maptest.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h
	new file:   src/maptest.c
	modified:   src/scroll.c
---

diff --git a/makefile b/makefile
index d7b11d7e..44cb0d39 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 FLAGS=-0 -d2 
 SRC=src\
 SRCLIB=$(SRC)lib\
-all: test.exe pcxtest.exe test2.exe scroll.exe
+all: test.exe pcxtest.exe test2.exe maptest.exe scroll.exe
 
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj
 	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj 16\lib\x\modex.lib
@@ -16,6 +16,9 @@ test2.exe: test2.obj modex16.obj bitmap.obj planar.obj
 pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj
 	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj
 
+maptest.exe: maptest.obj mapread.obj jsmn.obj
+        wcl $(FLAGS) maptest.obj jsmn.obj
+
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test.c
 	
@@ -25,6 +28,9 @@ test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
+maptest.obj: $(SRC)maptest.c $(SRCLIB)mapread.h
+        wcl $(FLAGS) -c $(SRC)maptest.c
+
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
diff --git a/maptest.exe b/maptest.exe
new file mode 100644
index 00000000..996e0fdf
Binary files /dev/null and b/maptest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 5d0ed08c..2b1044d3 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 432a0cc6..ed8ca99f 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -9,7 +9,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 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;
@@ -26,13 +26,10 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
 				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]);
+			//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); exit(-1); }
+//			map->tiles->data->data[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
+//			printf("%d[%d]", q, (byte)strtol(js+t->start, (char **)js+t->end, 10));
 		}
 		else
 		if(js_sv == "height")
@@ -51,8 +48,14 @@ 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);
+//			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 +1);
+			map->tiles = malloc(sizeof(tiles_t));
+			map->tiles->data = malloc(sizeof(bitmap_t));
+			map->tiles->data->width = (16*2);
+			map->tiles->data->height= 16;
+			map->tiles->data->data = malloc((16*2)*16);
 			js_sv="data";//strdup(js+t->start);//, t->end - t->start);
 			//printf("%s\n", js_sv);
 		}
@@ -82,11 +85,10 @@ 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/*, t->size*/);
+			j += dump(js, t+1+j, count-j, indent+1, map, i/*, &t->size*/);
 			//printf("==\n");
 		}
 		return j+1;
@@ -140,10 +142,13 @@ static int loadmap(char *mn, map_t *map/*, word w*/)
 			return 3;
 		}
 		strncpy(js + jslen, buf, r);
+//		printf("%s\n\n", js);
 		jslen = jslen + r;
 
 again:
+		//printf("================================================================================%s================================================================================", js);
 		r = jsmn_parse(&p, js, jslen, tok, tokcount);
+		//printf("================================================================================%s================================================================================", js);
 		if (r < 0) {
 			if (r == JSMN_ERROR_NOMEM) {
 				tokcount = tokcount * 2;
@@ -155,23 +160,15 @@ again:
 				goto again;
 			}
 		} else {
-			dump(js, tok, p.toknext, 0, map, 0/*, w*/);
-			//fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok));
-			//printf("[\n%d\n]", jslen);
+			//printf("================================================================================%s================================================================================", js);
+			dump(js, tok, p.toknext, 0, map, 0);
 			eof_expected = 1;
 		}
 	}
 
-	free(js);
-	free(tok);
+	//free(js);
+	//free(tok);
 	fclose(fh);
 
 	return 0;
 }
-
-/*int main()
-{
-	map_t map;
-	loadmap("../../../../data/test.map", &map);
-	return 0;
-}*/
diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 8fb76797..7200172c 100644
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -26,7 +26,7 @@ typedef struct {
 } map_t;
 
 static int jsoneq(const char *json, jsmntok_t *tok, const char *s);
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int 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*/);
 static int loadmap(char *mn, map_t *map/*, word w*/);
 
 #endif/*_LIBMAPREAD_H_*/
diff --git a/src/maptest.c b/src/maptest.c
new file mode 100644
index 00000000..e25c9818
--- /dev/null
+++ b/src/maptest.c
@@ -0,0 +1,8 @@
+#include "src/lib/mapread.c"
+
+int main()
+{
+	map_t map;
+	loadmap("data/test.map", &map);
+	return 0;
+}
diff --git a/src/scroll.c b/src/scroll.c
index 024b21fa..2d3a1c67 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -119,7 +119,7 @@ void main() {
 
 	/* create the map */
 	loadmap("data/test.map", &map/*, 0*/);
-	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
+	//map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 	//++++
 	initMap(&map);
@@ -608,19 +608,19 @@ initMap(map_t *map) {
 	int i;
 	int tile = 1;
 	//if(!isEMS() || !checkEMS())
-		map->tiles = malloc(sizeof(tiles_t));
+//		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));
+//		map->tiles->data = malloc(sizeof(bitmap_t));
 	//else
 	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
-	map->tiles->data->width = (TILEWH*2);
-	map->tiles->data->height= TILEWH;
+//	map->tiles->data->width = (TILEWH*2);
+//	map->tiles->data->height= TILEWH;
 	//if(!isEMS() || !checkEMS())
-		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+//		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
 	//else
 	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
 	map->tiles->tileHeight = TILEWH;