X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=23cbfa0d2f88618d797b202d9de952e38bfc8a5f;hb=734addea4c40d2e7fb6470bdf51ce96343a25e59;hp=e3f40b441bbee036658cc132a5a95a89d4a28a17;hpb=3aa2d573c4dace5af78bf8f8f21e46ca36334803;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
old mode 100644
new mode 100755
index e3f40b44..23cbfa0d
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -71,17 +71,20 @@ 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));
 			//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
@@ -127,7 +130,6 @@ int loadmap(char *mn, map_t *map)
 	char *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
-//----	char *buff = &buf;
 	static char js_ss[16];
 
 	jsmn_parser p;