palette is now arrays

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index b398a8e8d6fa4db88719bd0df62df1dcca62640d..6d38a789d041327531d045d90788873c83e29062 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -39,9 +39,7 @@ unsigned int i;
 \r
 #ifdef FADE\r
 //static word paloffset=0;\r
-byte *dpal;\r
 #endif\r
-byte *gpal;\r
 byte *ptr;\r
 memptr pal;\r
 \r
@@ -96,9 +94,9 @@ void main(int argc, char *argv[])
 \r
        // save the palette\r
 #ifdef FADE\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
+       modexPalSave(&gvar.video.dpal);\r
+       modexFadeOff(4, &gvar.video.dpal);\r
+       modexPalBlack();\r
 #endif\r
 \r
        VGAmodeX(1/*bakapee*/, 1, &gvar);\r
@@ -115,9 +113,8 @@ void main(int argc, char *argv[])
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 \r
@@ -135,11 +132,11 @@ void main(int argc, char *argv[])
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
-               modexFadeOff(4, gpal);\r
+               modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
                Quit(&gvar, "Wrong ID for sprite");\r
 #ifdef FADE\r
-               modexFadeOn(4, dpal);\r
+               modexFadeOn(4, &gvar.video.dpal);\r
 #endif\r
        }\r
 \r
@@ -147,9 +144,9 @@ 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
+//modexpdump(mv[0].page);\r
 #ifdef FADE\r
-       modexFadeOn(4, gpal);\r
+       modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
        {\r
@@ -172,7 +169,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->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
+               if(((mv[0].map->layerdata[0].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
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -209,7 +206,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); modexPalUpdate(dpal); IN_UserInput(1,1); }\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
@@ -219,9 +216,9 @@ void main(int argc, char *argv[])
        /* fade back to text mode */\r
        /* but 1st lets save the game palette~ */\r
 #ifdef FADE\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
-       modexFadeOff(4, gpal);\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
+       modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
        Shutdown16(&gvar);\r
        printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
@@ -229,6 +226,6 @@ void main(int argc, char *argv[])
        SCROLLEXITMESG;\r
        WCPU_cpufpumesg();\r
 #ifdef FADE\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
 }\r