moved my palette function failure to 16_vlpal.c

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 9c532d51af60b62419aa8dd1b59744f060d54c1c..6e7664f00125e87a0132b026f56ab2a9ec9ef9b7 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -34,6 +34,7 @@ sword bakapee;
 //debugswitches\r
 boolean panswitch=0;//1\r
 //extern boolean pageflipflop=1;\r
+extern boolean pagenorendermap;\r
 unsigned int i;\r
 //#ifdef FADE\r
        static word paloffset=0;\r
@@ -52,8 +53,6 @@ void main(int argc, char *argv[])
 \r
        Startup16(&gvar);\r
 \r
-       gvar.video.panp=0;\r
-\r
        /* create the map */\r
 //     fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
@@ -89,9 +88,9 @@ void main(int argc, char *argv[])
 #endif\r
 #endif\r
 //++++ PCXBMPVAR.offset=(paloffset/3);\r
-//++++ modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);\r
-       modexPalUpdate1(&PCXBMP->palette);\r
-//++++0000             modexPalUpdate1(map.tiles->btdata->palette);\r
+//++++ modexPalUpdate(&PCXBMPVAR, &paloffset, 0, 0);\r
+       modexPalUpdate(&PCXBMP->palette);\r
+//++++0000             modexPalUpdate(map.tiles->btdata->palette);\r
        //printf("      %d\n", sizeof(ptmp->data));\r
        //printf("1:    %d\n", paloffset);\r
 //++++ map.tiles->data->offset=(paloffset/3);\r
@@ -119,10 +118,18 @@ 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
-       playerXYpos(0, 0, &player, &mv, 0);\r
-       EN_initplayer(&player, 0);\r
-       player[0].enti.spri->x = player[0].enti.x-4;\r
-       player[0].enti.spri->y = player[0].enti.y-16;\r
+       ZC_playerXYpos(0, 0, &player, &mv, 0, 1);\r
+       EN_initplayer(&player, 0, &gvar.video);\r
+       if (gvar.video.sprifilei == -1)\r
+       {\r
+#ifdef FADE\r
+               modexFadeOff(4, gpal);\r
+#endif\r
+               Quit(&gvar, "Wrong");\r
+#ifdef FADE\r
+               modexFadeOn(4, dpal);\r
+#endif\r
+       }\r
 \r
 #ifndef        SPRITE\r
        modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);\r
@@ -130,8 +137,9 @@ void main(int argc, char *argv[])
        modexDrawSpriteRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y-TILEWH, 16, 64, 16, 32,   PCXBMPPTR);\r
 #endif\r
 \r
-       if(!pageflipflop)       VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);\r
-       else                    ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
+       //if(!pageflipflop)\r
+               VL_ShowPage(mv[1].page, 0, 0);//modexShowPage(mv[1].page);\r
+       //else                  ZC_ShowMV(&mv, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 \r
        //modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);\r
        /* buffer pages */\r
@@ -166,7 +174,7 @@ void main(int argc, char *argv[])
        if(!panswitch){\r
                ZC_walk(&mv, &player, 0);\r
        }else{\r
-               PANKEYFUN;//panPageManual(&mv, &player, 0);\r
+               PANKEYFUNZC;//panPageManual(&mv, &player, 0);\r
                //printf("      player[0].enti.q: %d", player[0].enti.q);       printf("        player[0].d: %d\n", player[0].d);\r
        }\r
 \r
@@ -197,25 +205,7 @@ void main(int argc, char *argv[])
 #endif\r
 #endif\r
        //pan switch\r
-       if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12\r
-       if(IN_KeyDown(87))      //f11\r
-       {\r
-               pageflipflop=!pageflipflop;\r
-               IN_UserInput(1,1);\r
-//             VGAmodeX(0, 0, &gvar);\r
-//             IN_Shutdown();\r
-//             __asm\r
-//             {\r
-//                     mov ah,31h\r
-//                     int 21h\r
-//             }\r
-       }\r
-       if(IN_KeyDown(68))      //f10\r
-       {\r
-               gvar.kurokku.fpscap=!gvar.kurokku.fpscap;\r
-               IN_UserInput(1,1);\r
-       }\r
-       if(IN_KeyDown(67))      //f9\r
+       if(IN_KeyDown(62))      //f3\r
        {\r
                modexClearRegion(mv[1].page, 0, 0, mv[1].page->width, mv[1].page->height, 2);\r
                modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 3);\r
@@ -223,19 +213,14 @@ void main(int argc, char *argv[])
                modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);\r
                //IN_UserInput(1,1);\r
        }\r
-#ifdef SPRITE\r
-       if(IN_KeyDown(66))      //f8\r
-       {\r
-//             modexDrawSprite(mv[0].page, 16, 16, &p);\r
-               modexDrawSprite(mv[0].page, 32+72, 16, (PCXBMPVAR));\r
-       }\r
-#endif\r
-       FUNCTIONKEYFUNCTIONS;\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
 \r
        //9\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