hmmm layers in map_t ....

diff --git a/data/G.PAL b/data/G.PAL
index d5aa70a645f22c209c1d4864b1b074491295094d..8092380af954e11b165eae773d83f03429619756 100755 (executable)
Binary files a/data/G.PAL and b/data/G.PAL differ

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 52435a91393a90b0b8e30853d69a932d4f46be46..54ec8b9c3b3406fb64dd936e49344866ddca05ee 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -50,10 +50,10 @@ typedef struct {
 \r
 typedef struct {\r
        byte far **data;\r
-       word ntiles;   /* the number of tiles */\r
-       word twidth;   /* width of the tiles */\r
-       word theight;  /* height of the tiles */\r
-       byte *palette; /* palette for the tile set */\r
+       word ntiles;            // the number of tiles\r
+       word twidth;    // width of the tiles\r
+       word theight;   // height of the tiles\r
+       byte *palette;  // palette for the tile set\r
 } tileset_t;\r
 \r
 typedef struct {\r
@@ -66,9 +66,9 @@ typedef struct {
 \r
 //TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       bitmap_t far *data;             //old\r
+       bitmap_t far *pcximg;           //old\r
        //planar_buf_t far *data;       //old\r
-       word tileHeight, tileWidth;\r
+       word tileHeight, tileWidth;     //defined by mapfile\r
        unsigned int rows, cols;\r
 //     #ifdef __DEBUG__\r
 //     boolean debug_text;     //show the value of the tile! wwww\r
@@ -115,12 +115,12 @@ typedef struct{
        sword tilemidposscreeny;        /* middle tile y position */    /* needed for scroll system to work accordingly */\r
        sword tileplayerposscreenx;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
        sword tileplayerposscreeny;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
-} tileinfo_t;\r
+} pagetileinfo_t;\r
 \r
 typedef struct {\r
        nibble/*word*/ id;      /* the Identification number of the page~ For layering~ */\r
        byte far* data; /* the data for the page */\r
-       tileinfo_t      ti;\r
+       pagetileinfo_t  ti;\r
        word dx;                /* col we are viewing on virtual screen (on page[0]) */ /* off screen buffer on the left size */\r
        word dy;                /* row we are viewing on virtual screen (on page[0]) */ /* off screen buffer on the top size */\r
        word sw;                /* screen width */      /* resolution */\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 9a4708abedfe2daf0e7ec74287c36db2849cd680..6f5665ec1002f96b82c18403cc222b584d745003 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -574,8 +574,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
        }\r
        else\r
        {\r
-               rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
-               ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);\r
+               rx = (((i-1) % ((t->pcximg->width)/t->tileWidth)) * t->tileWidth);\r
+               ry = (((i-1) / ((t->pcximg->height)/t->tileHeight)) * t->tileHeight);\r
 ////0000printf("i=%d\n", i);\r
 #ifdef __DEBUG_MAP__\r
                switch(dbg_maptext)\r

diff --git a/src/zcroll.c b/src/zcroll.c
index e1f92fad8e851ef91b2ff8880f865f32cc2b3c74..b398a8e8d6fa4db88719bd0df62df1dcca62640d 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -112,7 +112,7 @@ void main(int argc, char *argv[])
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
-       VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
+       //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
        gpal = modexNewPal();\r
@@ -147,6 +147,7 @@ void main(int argc, char *argv[])
        gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
        shinku(&gvar);\r
+       modexpdump(mv[0].page);\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r