==== FIXED MAP INDEX NUMBER PRITING IN DRAWTILE wwww ====

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 7d586501ce2ebf6630769e8cabe43be5e2aa3e86..342f3ba54b058bdce07d85e2db539793fc0578ac 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -82,7 +82,7 @@ void main(int argc, char *argv[])
 \r
        // create the map\r
 //     fprintf(stderr, "testing map load~      ");\r
-       loadmap("data/test.map", &map);\r
+       CA_loadmap("data/test.map", &map, &gvar);\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
 //     printf("chkmap ok       ");\r
@@ -103,15 +103,17 @@ void main(int argc, char *argv[])
 \r
        VGAmodeX(1/*bakapee*/, 1, &gvar);\r
 \r
-       /* fix up the palette and everything */\r
-#ifdef FADE\r
-       modexPalBlack();        //reset the palette~\r
-#endif\r
-\r
        /* load color palette */\r
+       /*ptmp.offset=(paloffset/3);\r
+       modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
+       //modexClearRegion(bg->page, 0, 0, 320, 240, 255);\r
+       //printf("      %d\n", sizeof(ptmp.data));\r
+       //printf("1:    %d\n", paloffset);\r
+       map.tiles->data->offset=(paloffset/3);\r
+       modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
-//     CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);\r
-//     modexPalUpdate1(pal);\r
+       //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
+\r
 #ifdef FADE\r
        gpal = modexNewPal();\r
        modexPalSave(gpal);\r
@@ -142,12 +144,17 @@ void main(int argc, char *argv[])
        }\r
 \r
 //     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
+       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
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
        {\r
+               gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+               gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
                shinku(&gvar);\r
                //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
                //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
@@ -165,7 +172,7 @@ void main(int argc, char *argv[])
 \r
                //the scripting stuff....\r
                //if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
-               if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
+               if(((mv[0].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -177,8 +184,8 @@ void main(int argc, char *argv[])
                if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }\r
                //debugging binds!\r
 \r
-               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
-               if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
+               if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
 \r
                FUNCTIONKEYFUNCTIONS\r
                FUNCTIONKEYDRAWJUNK\r
@@ -202,7 +209,7 @@ void main(int argc, char *argv[])
                        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
                }//JK\r
 #ifdef FADE\r
-               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r