updateing

diff --git a/16.exe b/16.exe
index 2cfa243e60d361cd18c1f3515bc1274704c5ca2c..b586178f807a9ed22ff235b45ccef09bf66ab9de 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 494d15e69319cb2aed2cc43acee8457bd7985b94..0aab5d9784a444963dda3c5d657be1b0cb385e0c 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 392d02c71dc0dcab0ea049b741def80b7093b526..3b6dd5f3febf9e43684578eae81456d044efdece 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 7276d5bc5fbb735e9472b01e95daeceeca68d8f7..3e772ef058f57d126c0f09709f9fcdc95374b455 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index a8c8ab9f4718d993aeca5194cec9fb9bd3322e09..f8c4bd71ca68a45ff681049e704a88646bab1d9c 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 9bfdf6c966f60bf850fd3116bc73ec6467ec7e27..7713597a515af6aa6dac553f170eb2edcddd52d1 100755 (executable)
--- 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,14 @@ 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);
+                       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;

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 3f9e3ac64c07d9071f721e4bf607ab578285c2ce..0cda1073b8a1617a4bc6a7a4892ee752381cfcb2 100755 (executable)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -16,8 +16,7 @@
 //#define DEBUG_JS\r
 \r
 typedef struct {\r
-//---- bitmap_t huge *btdata;\r
-       //planar_buf_t huge *data;\r
+       bitmap_t huge *btdata;\r
        planar_buf_t data;\r
        word tileHeight;\r
        word tileWidth;\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 939361575e602a69993e4c3fd77680076b702cba..156f2e5c30da834af19b7b6192476a556ed74e1b 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,7 +34,7 @@
 #include "src/lib/wcpu/wcpu.h"
 
 //#define SPRITE
-#define TILERENDER
+//#define TILERENDER
 
 #define PBUFSFUN               modexDrawSpritePBufRegion
 #define PBUFBFUN               modexDrawBmpPBufRegion

diff --git a/test.exe b/test.exe
index f33b73c5e483d369fdffaf702b39e08f0dd86feb..65f1a7aabf7f5a6e92c07451047622e2ddc3431f 100755 (executable)
Binary files a/test.exe and b/test.exe differ