fack

diff --git a/16.exe b/16.exe
index b987085..9c4b819 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 6b0c712..621d34e 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/maptest.exe b/maptest.exe
index b9ff97d..f6f1ce9 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index d2e447a..ce8a91e 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index d46bc2c..ff29be6 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 4dbcc1a..4cfd67d 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index bbf5fb8..5da97c8 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 4f25bbd..d434116 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -161,7 +161,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
 \r
        /* allocate the pixel storage for the tiles */\r
        ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
-       ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
+       //ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
        for(i=1; i < ts.ntiles; i++) {\r
                ts.data[i] = ts.data[i-1] + twidth * theight;\r
        }\r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 2e1cd48..3d0fb2c 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -48,7 +48,7 @@ typedef struct {
 } bitmap_t;\r
 \r
 typedef struct {\r
-       byte **data;\r
+       byte huge **data;\r
        word ntiles;   /* the number of tiles */\r
        word twidth;   /* width of the tiles */\r
        word theight;  /* height of the tiles */\r

diff --git a/src/scroll.c b/src/scroll.c
index b89d129..eef7a87 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -88,7 +88,7 @@ void main(int argc, char *argv[])
        /* draw the tiles */
 #ifdef MODEX
        ptr = map.data;
-       //mappalptr = map.tiles->btdata->palette;
+       mappalptr = map.tiles->data->palette;
 
        /* data */
        p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
@@ -126,7 +126,7 @@ void main(int argc, char *argv[])
 //++++ player[0].data.offset=(paloffset/3);
 //++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
                //modexPalUpdate1(p.palette);
-               modexPalUpdate1(map.tiles->btdata->palette);
+               modexPalUpdate1(map.tiles->data->palette);
        //printf("      %d\n", sizeof(ptmp->data));
        //printf("1:    %d\n", paloffset);
 //++++ map.tiles->data->offset=(paloffset/3);
@@ -356,9 +356,9 @@ void main(int argc, char *argv[])
        if(IN_KeyDown(22)){
        paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
        printf("1paloffset      =       %d\n", paloffset/3);
-        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+       modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
        printf("2paloffset      =       %d\n", paloffset/3);
-        pdump(bg->page); pdump(spri->page); }
+       pdump(bg->page); pdump(spri->page); }
 #endif
 #endif
        //pan switch

diff --git a/test.exe b/test.exe
index 30545c1..51669ad 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 6cddf53..965a81e 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ