X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=d0bdd81001e8f811414ade1a28a9b292dc7a9f34;hb=b86d6405d4000f67776b98d6cee575d08dd736a6;hp=b6219969d60be486d77a2d255f97439ebbd6079e;hpb=1287746074527ec8af4c6ca515802e5a72d0ef05;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
old mode 100644
new mode 100755
index b6219969..d0bdd810
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -13,6 +13,7 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 	dword i;
 	word j;//, k;
 	bitmap_t bp;
+	planar_buf_t bpp;
 	#ifdef DEBUG_JS
 	if(indent==0)
 	{
@@ -71,10 +72,15 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 //			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 = malloc(sizeof(byte) * (t+1)->size);
 			map->tiles = malloc(sizeof(tiles_t));
-			//map->tiles->data = malloc(sizeof(bitmap_t));
+			map->tiles->btdata = malloc(sizeof(bitmap_t));
+			map->tiles->btdata = malloc(sizeof(bitmap_t));
 			//fix this to be far~
-			bp = bitmapLoadPcx("data/ed.pcx");
-			map->tiles->data = &bp;
+//			bp = bitmapLoadPcx("data/ed.pcx");
+			bp = bitmapLoadPcx("data/koishi^^.pcx");
+			bpp = planar_buf_from_bitmap0(&bp);
+			map->tiles->btdata = &bp;
+			//0000++++map->tiles->data = planar_buf_from_bitmap0(&bp);
+			map->tiles->data = bpp;
 			//map->tiles->data->data = malloc((16/**2*/)*16);
 			//map->tiles->data->width = (16/**2*/);
 			//map->tiles->data->height= 16;
@@ -82,6 +88,7 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 			map->tiles->tileWidth = 16;
 			map->tiles->rows = 1;
 			map->tiles->cols = 1;
+			map->tiles->debug_text=false;
 			strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
 		}
 		else