no idea how to get joy buttons 2 and 3 to function.

[proj16/16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 7fb6f75..ce44e58 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -28,7 +28,6 @@
 #define MODEX  //this is for mode x initiating\r
 \r
 static map_t map;\r
-map_view_t mv[4];\r
 float t;\r
 sword bakapee;\r
 //debugswitches\r
@@ -68,7 +67,7 @@ void main(int argc, char *argv[])
 \r
 #endif\r
        /*      input!  */\r
-       IN_Default(0, &gvar.gvar.player,ctrl_Keyboard1);\r
+       IN_Default(0, &gvar.gvar.player[0],ctrl_Keyboard1);\r
 \r
        /* save the palette */\r
 #ifdef MODEX\r
@@ -107,16 +106,16 @@ void main(int argc, char *argv[])
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&mv, &map, &gvar);\r
+       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
        //renderswitch\r
        gvar.video.rss=1;\r
 \r
        /* set up paging */\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
-       mapGoTo(&mv, 0, 0);\r
+       mapGoTo(&gvar.mv, 0, 0);\r
 \r
-       ZC_gvar.playerXYpos(0, 0, &gvar.player, &mv, 0, 1);\r
+       ZC_gvar.playerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);\r
        EN_initgvar.player(&gvar.player, 0, &gvar.video);\r
        if (gvar.video.sprifilei == -1)\r
        {\r
@@ -130,19 +129,19 @@ void main(int argc, char *argv[])
        }\r
 \r
 #ifndef        SPRITE\r
-       modexClearRegion(mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);\r
+       modexClearRegion(gvar.mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);\r
 #else\r
        modexDrawSpriteRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 64, 16, 32, PCXBMPPTR);\r
 #endif\r
 \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
+               VL_ShowPage(gvar.mv[1].page, 0, 0);//modexShowPage(gvar.mv[1].page);\r
+       //else                  ZC_ShowMV(&gvar.mv, 0, 0);//modexShowPage(gvar.mv[0].page);//!(gvar.video.p)\r
 \r
        //modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);\r
        /* buffer pages */\r
-//     modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47);\r
-//     modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45);\r
+//     modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 47);\r
+//     modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 45);\r
 //     {\r
 //             unsigned int k,j,o;\r
 //             /* fill screen with a distinctive pattern */\r
@@ -153,7 +152,7 @@ void main(int argc, char *argv[])
 //                                     vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!\r
 //             }\r
 //     }\r
-       modexClearRegion(mv[3].page, 0, 128, 24, 36, 15);\r
+       modexClearRegion(gvar.mv[3].page, 0, 128, 24, 36, 15);\r
 \r
 #ifdef MODEX\r
 #ifdef FADE\r
@@ -170,15 +169,15 @@ void main(int argc, char *argv[])
        //gvar.player movement\r
                IN_ReadControl(0, &gvar.player);\r
        if(!panswitch){\r
-               ZC_walk(&mv, &gvar.player, 0);\r
+               ZC_walk(&gvar.mv, &gvar.player, 0);\r
        }else{\r
-               PANKEYFUNZC;//panPageManual(&mv, &gvar.player, 0);\r
+               PANKEYFUNZC;//panPageManual(&gvar.mv, &gvar.player, 0);\r
                //printf("      gvar.player[0].enti.q: %d", gvar.player[0].enti.q);     printf("        gvar.player[0].d: %d\n", gvar.player[0].d);\r
        }\r
 \r
        //the scripting stuff....\r
        //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
-       if(((mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+       if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
        {\r
                short i;\r
                for(i=800; i>=400; i--)\r
@@ -191,25 +190,25 @@ void main(int argc, char *argv[])
        //debugging binds!\r
 #ifdef MODEX\r
 #ifdef FADE\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(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);  IN_UserInput(1); } //p\r
        /*if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("2paloffset      =       %d\n", paloffset/3);\r
-        modexpdump(mv[0].page); modexpdump(mv[1].page);\r
-               IN_UserInput(1,1);\r
+        modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);\r
+               IN_UserInput(1);\r
        }*/\r
 #endif\r
 #endif\r
        //pan switch\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
-               modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 4);\r
-               modexClearRegion(mv[3].page, 0, 0, 20, 36, 15);\r
-               //IN_UserInput(1,1);\r
+               modexClearRegion(gvar.mv[1].page, 0, 0, gvar.mv[1].page->width, gvar.mv[1].page->height, 2);\r
+               modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 3);\r
+               modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 4);\r
+               modexClearRegion(gvar.mv[3].page, 0, 0, 20, 36, 15);\r
+               //IN_UserInput(1);\r
        }\r
 \r
        FUNCTIONKEYFUNCTIONS\r
@@ -218,7 +217,7 @@ void main(int argc, char *argv[])
 \r
        //9\r
 #ifdef FADE\r
-               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1); }\r
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r