fack

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

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

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

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

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

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

diff --git a/scroll.exe b/scroll.exe
index bbf5fb87029d475c7df63075dd6d51b296f1fd12..5da97c8d8ede7ad2e9b56f9b18bbf6e81835f0a7 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 4f25bbd42d2454b1dd16033d6b486cee52fb3b9a..d43411699873b2fca5119cc26a7752b2466813fa 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 2e1cd4883a74617ae1afbde2a0e3a37d0e9e52d8..3d0fb2c674916ec112a3c29b9e0e32e0777eb6c2 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 b89d1291b45e5065797457dfac96500056cf4cd2..eef7a87d6f5e08e17db42d3faee0b5c9d73610bb 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 30545c1fca4dec8cb41af5e5d526e3a7c3892d4c..51669ada89ec965b7135143be75376109c0309f0 100755 (executable)
Binary files a/test.exe and b/test.exe differ

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