wwww what did i change?

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 7cfc324876efd17fd202bb79ff13072dba771343..36a7370c2fa96bfcc23fe33cac557dcda0f90455 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,13 +34,12 @@ sword bakapee;
 //debugswitches\r
 boolean panswitch=0;//1\r
 //extern boolean pageflipflop=1;\r
-boolean pagenorendermap = 1;\r
+extern boolean pagenorendermap;\r
 unsigned int i;\r
 //#ifdef FADE\r
        static word paloffset=0;\r
-       byte *dpal;\r
+       byte *gvar.video.dpal;\r
 //#endif\r
-       byte *gpal;\r
 //     byte *ptr;\r
        byte *mappalptr;\r
 \r
@@ -53,11 +52,9 @@ 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
+       CA_loadmap("data/test.map", &map, &gvar);\r
        chkmap(&map, 0);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
@@ -77,9 +74,9 @@ void main(int argc, char *argv[])
        /* save the palette */\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       dpal = modexNewPal();\r
-       modexPalSave(dpal);\r
-       modexFadeOff(4, dpal);\r
+       gvar.video.dpal = modexNewPal();\r
+       modexPalSave(gvar.video.dpal);\r
+       modexFadeOff(4, gvar.video.dpal);\r
 #endif\r
 \r
        VGAmodeX(bakapee, 1, &gvar);\r
@@ -90,9 +87,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
@@ -102,9 +99,9 @@ void main(int argc, char *argv[])
 //     printf("====\n\n");\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       gpal = modexNewPal();\r
-       modexPalSave(gpal);\r
-       modexSavePalFile("data/g.pal", gpal);\r
+       &gvar.video.palette = modexNewPal();\r
+       modexPalSave(&gvar.video.palette);\r
+       modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 #endif\r
@@ -120,10 +117,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, &gvar.video.palette);\r
+#endif\r
+               Quit(&gvar, "Wrong");\r
+#ifdef FADE\r
+               modexFadeOn(4, gvar.video.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
@@ -131,8 +136,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
@@ -152,7 +158,7 @@ void main(int argc, char *argv[])
 \r
 #ifdef MODEX\r
 #ifdef FADE\r
-       modexFadeOn(4, gpal);\r
+       modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
@@ -173,7 +179,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->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
@@ -186,7 +192,7 @@ void main(int argc, char *argv[])
        //debugging binds!\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
+       if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
        /*if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
@@ -206,20 +212,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
+\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(gvar.video.dpal); IN_UserInput(1,1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
@@ -230,9 +230,9 @@ void main(int argc, char *argv[])
        /* but 1st lets save the game palette~ */\r
 #ifdef MODEX\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
        VGAmodeX(0, 1, &gvar);\r
 #endif\r
@@ -243,7 +243,7 @@ void main(int argc, char *argv[])
        WCPU_cpufpumesg();\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       modexFadeOn(4, dpal);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
 #endif\r
 }\r