Merge remote-tracking branch 'upstream/master'

[16.git] / src / lib / mapread.c

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 7713597a515af6aa6dac553f170eb2edcddd52d1..23cbfa0d2f88618d797b202d9de952e38bfc8a5f 100755 (executable)
--- 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,13 +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");
-                       bpp = planar_buf_from_bitmap0(&bp);
+//                     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;