working on palllist.c and no idea how to preserve bg fixed player[0].enti. wwww also...

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 6cdba594518faaeee6ddf7d4bdba3e86201021bd..19b3bb6b776ca10c91c72a2922127c9b38eef5d8 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
@@ -36,15 +38,13 @@ boolean pagenorendermap = 0;        //default: 0
 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
@@ -89,7 +89,6 @@ void main(int argc, char *argv[])
 //     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
@@ -124,14 +123,11 @@ 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
+       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
@@ -151,14 +147,11 @@ void main(int argc, char *argv[])
        }\r
 \r
 //     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
-       VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\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
@@ -218,11 +211,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