made a new function modexMVSetup()

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 00c672ca3913cdeddefb5edf0066d96eaf63a0e3..d3ff0ef2cc1367f780962d0a63da3719b642df6f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -22,15 +22,13 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/wcpu/wcpu.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
-//#define FADE\r
+#define FADE\r
 #define MODEX  //this is for mode x initiating\r
 \r
 //bitmap_t p;\r
 static map_t map;\r
-player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
 //word pn=0; //i forgot ww\r
 float t;\r
@@ -40,13 +38,12 @@ pan_t pan;
 boolean panswitch=0;//1\r
 //extern boolean pageflipflop=1;\r
        unsigned int i;\r
-       const char *cpus;\r
        //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
 \r
        //map_view_db_t pgid[4];\r
        word pg;\r
 //#ifdef FADE\r
-       //static word paloffset=0;\r
+       static word paloffset=0;\r
        byte *dpal;\r
 //#endif\r
        byte *gpal;\r
@@ -56,6 +53,7 @@ boolean panswitch=0;//1
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
+       static player_t player[MaxPlayers];\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -127,13 +125,7 @@ void main(int argc, char *argv[])
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       for(i=0;i<gvar.video.num_of_pages;i++)\r
-       {\r
-               mv[i].page = &gvar.video.page[i];\r
-               mv[i].map = &map;\r
-               mv[i].video = &gvar.video;\r
-               mv[i].pan       = &pan;\r
-       }\r
+       modexMVSetup(&mv, &map, &pan, &gvar);\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
@@ -190,7 +182,7 @@ void main(int argc, char *argv[])
        if(!panswitch){\r
                walk(mv, &player, 0);\r
        }else{\r
-               panpagemanual(mv, &player, 0);\r
+               panPageManual(mv, &player, 0);\r
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);\r
        }\r
 \r
@@ -217,14 +209,14 @@ void main(int argc, char *argv[])
 #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(22)){\r
+       /*if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &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
-       }\r
+       }*/\r
 #endif\r
 #endif\r
        //pan switch\r
@@ -259,7 +251,8 @@ void main(int argc, char *argv[])
 //             modexDrawSprite(mv[0].page, 16, 16, &p);\r
                modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
        }\r
-       //TODO fmemtest into page\r
+       FUNCTIONKEYFUNCTIONS;\r
+       // fmemtest into page\r
        /*if(IN_KeyDown(4+1))   //4\r
        {\r
                pg=1;\r
@@ -268,8 +261,11 @@ void main(int argc, char *argv[])
        }*/\r
 \r
        //9\r
-       if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-       //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
+#ifdef FADE\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
+#endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
        }\r
 \r
@@ -287,14 +283,7 @@ void main(int argc, char *argv[])
        printf("\nProject 16 scroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        SCROLLEXITMESG;\r
-       switch(detectcpu())\r
-       {\r
-               case 0: cpus = "8086/8088 or 186/88"; break;\r
-               case 1: cpus = "286"; break;\r
-               case 2: cpus = "386 or newer"; break;\r
-               default: cpus = "internal error"; break;\r
-       }\r
-       printf("detected CPU type: %s\n", cpus);\r
+       WCPU_cpufpumesg();\r
 #ifdef MODEX\r
 #ifdef FADE\r
        modexFadeOn(4, dpal);\r