X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=d3fdbdaec3bc911af675fb5012b85b94b62224d1;hb=92256c9e07a0866c3b8f2101f5c2522b988eb56e;hp=86dc10af59ea5564afd18af90de41fec3e5fba85;hpb=58947b239b0c268e8eecf88906e4d742e877956b;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 86dc10af..d3fdbdae 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -9,8 +9,9 @@ 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 i, j, k;
+	bitmap_t bp;
 	if (count == 0) {
 		return 0;
 	}
@@ -48,11 +49,12 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 //			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));
-			//map->tiles->data = bitmapLoadPcx("data/chikyuu.pcx");
-			map->tiles->data->data = malloc((16/**2*/)*16);
-			map->tiles->data->width = (16/**2*/);
-			map->tiles->data->height= 16;
+			//map->tiles->data = malloc(sizeof(bitmap_t));
+			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;
@@ -73,9 +75,9 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		j = 0;
 		for (i = 0; i < t->size; i++) {
 			//for (k = 0; k < indent; k++) printf("\t");
-			j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
+			j += dump(js, t+1+j, count-j, indent+1, map, i);
 			//printf(": ");
-			j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
+			j += dump(js, t+1+j, count-j, indent+1, map, i);
 			//printf("\n");
 		}
 		return j+1;
@@ -85,7 +87,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 		for (i = 0; i < t->size; i++) {
 			//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);
 			//printf("==\n");
 		}
 		return j+1;
@@ -93,7 +95,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 	return 0;
 }
 
-static int loadmap(char *mn, map_t *map/*, word w*/)
+static int loadmap(char *mn, map_t *map)
 {
 	int r;
 	int eof_expected = 0;