just pushing before i use ZC_mapscroll

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 1667459fa1501d29127589726bd653b740ada43a..582920ce324f65946332d2d4a228af2d1f159246 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.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
@@ -25,6 +25,8 @@
 #include "src/lib/16render.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
+#define FADE\r
+\r
 static map_t map;\r
 map_view_t mv[4];\r
 float t;\r
@@ -32,19 +34,17 @@ float t;
 //debugswitches\r
 boolean panswitch=0,baka=0;\r
 //extern boolean pageflipflop=1;\r
-boolean pagenorendermap = 1;   //default: 0\r
+boolean pagenorendermap = 0;   //default: 0\r
 unsigned int i;\r
 \r
 #ifdef FADE\r
-static word paloffset=0;\r
+//static word paloffset=0;\r
 byte *dpal;\r
 #endif\r
 byte *gpal;\r
 byte *ptr;\r
 memptr pal;\r
 \r
-//bitmap_t     *ptmpdata;\r
-\r
 #define FILENAME_1     "data/spri/chikyuu.vrs"\r
 #define FILENAME_1P    "data/spri/chikyuu.pal"\r
 #define FILENAME_2     "data/spri/ptmp.vrs"\r
@@ -61,8 +61,6 @@ void main(int argc, char *argv[])
 \r
        Startup16(&gvar);\r
 \r
-       gvar.video.panp=0;\r
-\r
        bakapee1=malloc(64);\r
        bakapee1p=malloc(64);\r
 \r
@@ -86,11 +84,11 @@ void main(int argc, char *argv[])
 //     fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
        chkmap(&map, 0);\r
+//     initMap(&map);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
-       //read_vrs(&gvar, , .spri->spritesheet);\r
        VRS_LoadVRS(bakapee1, &player[0].enti, &gvar);\r
 \r
        // input!\r
@@ -125,15 +123,12 @@ void main(int argc, char *argv[])
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
 \r
-       //renderswitch\r
-       gvar.video.rss=0;\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
 \r
-       playerXYpos(0, 0, &player, &mv, 0);\r
-       EN_initplayer(&player, 0);\r
+       ZC_playerXYpos(0, 0, &player, &mv, 0);\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
@@ -150,15 +145,13 @@ void main(int argc, char *argv[])
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
-       animate_spri(&(player[0].enti), &gvar.video);\r
 \r
-       VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\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
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
-       /*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");\r
-       modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);\r
-       while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww\r
        while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
        {\r
                shinku(&gvar);\r
@@ -193,22 +186,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
@@ -218,11 +195,13 @@ void main(int argc, char *argv[])
                        {\r
                                bakapee1=FILENAME_1;\r
                                bakapee1p=FILENAME_1P;\r
+                               player[0].enti.overdraww=0;\r
                        }\r
                        if(IN_KeyDown(sc_K))\r
                        {\r
                                bakapee1=FILENAME_2;\r
                                bakapee1p=FILENAME_2P;\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
@@ -233,7 +212,7 @@ void main(int argc, char *argv[])
 #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
@@ -243,7 +222,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