X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=51b40bfb7f114e300c6739f98292bc7c5fe6c2d9;hp=777de7da29f645b238714f67ea2da658023603aa;hpb=4e9c69f2b1452b68cd173340037c5036928840db;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
old mode 100644
new mode 100755
index 777de7da..23cbfa0d
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -69,19 +69,22 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 		{
 //			fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
 //			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 = _nmalloc(sizeof(byte) * (t+1)->size);
-			map->tiles = _nmalloc(sizeof(tiles_t));
-			//map->tiles->data = malloc(sizeof(bitmap_t));
+			map->data = malloc(sizeof(byte) * (t+1)->size);
+			map->tiles = malloc(sizeof(tiles_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/koishi^^.pcx");
+			map->tiles->btdata = &bp;
+			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;
-			map->tiles->tileHeight = 16;
-			map->tiles->tileWidth = 16;
-			map->tiles->rows = 1;
+			//map->tiles->data->width = (16/**2*/);
+			//map->tiles->data->height= 16;
+			map->tiles->tileHeight = 16;
+			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