X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=d0bdd81001e8f811414ade1a28a9b292dc7a9f34;hb=d50eae35f5e87d5c2fe4483badbafd25878612a6;hp=9bfdf6c966f60bf850fd3116bc73ec6467ec7e27;hpb=74929b07c8b45a20eb5079444f4df21c9898e605;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 9bfdf6c9..d0bdd810 100755 --- 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 = planar_buf_from_bitmap0(&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;