added resetting palette in cmem part of modexenter

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 8c148d9c6d08f007850bc88ad340fe131a490114..3723b201a5d642b4a4e1d0ee46d418d587dcb80e 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -34,7 +34,7 @@ float t;
 //debugswitches\r
 boolean panswitch=0,baka=0;\r
 //extern boolean pageflipflop=1;\r
-boolean pagenorendermap = 0;   //default: 0\r
+extern boolean pagenorendermap;        //default: 0\r
 unsigned int i;\r
 \r
 #ifdef FADE\r
@@ -103,15 +103,9 @@ 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
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
-//     CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);\r
-//     modexPalUpdate1(pal);\r
+\r
 #ifdef FADE\r
        gpal = modexNewPal();\r
        modexPalSave(gpal);\r
@@ -127,33 +121,31 @@ void main(int argc, char *argv[])
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
        mapGoTo(&mv, 0, 0);\r
 \r
-       ZC_playerXYpos(0, 0, &player, &mv, 0);\r
+       ZC_playerXYpos(0, 0, &player, &mv, 0, 1);\r
        EN_initplayer(&player, 0, &gvar.video);\r
-       player[0].enti.spri->x = player[0].enti.x-4;\r
-       player[0].enti.spri->y = player[0].enti.y-16;\r
-\r
-       player[0].enti.dire=31;\r
-       gvar.video.sprifilei = set_anim_by_id(player[0].enti.spri, player[0].enti.dire);\r
        //print_anim_ids(player[0].enti.spri);\r
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
                modexFadeOff(4, gpal);\r
 #endif\r
-               Quit(&gvar, "Wrong");\r
+               Quit(&gvar, "Wrong ID for sprite");\r
 #ifdef FADE\r
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
 \r
 //     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
-       VL_ShowPage(mv[0].page, 0, 0);\r
-       animate_spri(&(player[0].enti), &gvar.video);\r
+       gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
+       gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
+       shinku(&gvar);\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
@@ -186,22 +178,6 @@ void main(int argc, char *argv[])
                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
 \r
-               //pan switch\r
-               if(IN_KeyDown(66))      //f8\r
-               {\r
-//                     modexDrawSprite(mv[0].page, 16, 16, &p);\r
-//                     modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
-                       switch(i)\r
-                       {\r
-                               case 11:\r
-                                       i=0;\r
-                                       player[0].enti.spri->x = TILEWH;\r
-                               default:\r
-                                       i++;\r
-                                       animate_spri(&(player[0].enti), &gvar.video);// player[0].enti.spri->x += 16;\r
-                               break;\r
-                       }\r
-               }\r
                FUNCTIONKEYFUNCTIONS\r
                FUNCTIONKEYDRAWJUNK\r
                if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
@@ -211,24 +187,24 @@ void main(int argc, char *argv[])
                        {\r
                                bakapee1=FILENAME_1;\r
                                bakapee1p=FILENAME_1P;\r
-                               enti->overdraww=0;\r
+                               player[0].enti.overdraww=0;\r
                        }\r
                        if(IN_KeyDown(sc_K))\r
                        {\r
                                bakapee1=FILENAME_2;\r
                                bakapee1p=FILENAME_2P;\r
-                               enti->overdraww=2;\r
+                               player[0].enti.overdraww=2;\r
                        }\r
                        //read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
                        VRS_ReadVRS(bakapee1, &player[0].enti, &gvar);\r
                        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
-               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync!\r
+               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;  //incase things go out of sync!\r
        }\r
 \r
        /* fade back to text mode */\r
@@ -238,7 +214,6 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", gpal);\r
        modexFadeOff(4, gpal);\r
 #endif\r
-       VGAmodeX(0, 1, &gvar);\r
        Shutdown16(&gvar);\r
        printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r