X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=496c6da40bdf534f4ddf3833aee732d1631e5824;hp=d0bdd81001e8f811414ade1a28a9b292dc7a9f34;hpb=524c6568bcdca11e835f545cad52d7be197efaaa;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index d0bdd810..23cbfa0d 100755
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -13,7 +13,6 @@ 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)
 	{
@@ -73,14 +72,11 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 			map->data = malloc(sizeof(byte) * (t+1)->size);
 			map->tiles = malloc(sizeof(tiles_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");
-			bp = bitmapLoadPcx("data/koishi^^.pcx");
-			bpp = planar_buf_from_bitmap0(&bp);
+			bp = bitmapLoadPcx("data/ed.pcx");
+//			bp = bitmapLoadPcx("data/koishi^^.pcx");
 			map->tiles->btdata = &bp;
-			//0000++++map->tiles->data = planar_buf_from_bitmap0(&bp);
-			map->tiles->data = bpp;
+			map->tiles->data = planar_buf_from_bitmap(&bp);
 			//map->tiles->data->data = malloc((16/**2*/)*16);
 			//map->tiles->data->width = (16/**2*/);
 			//map->tiles->data->height= 16;