[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 9416cf9ee5ab38a1477f7931a4bfd8eab5e0b113..ef1d11ede98961b7f3fa501906e47ac4f9075dd2 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,12 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/16_dbg.h"\r
+//#include "src/lib/16_dbg.h"\r
+\r
+#ifdef __DEBUG__\r
+boolean\r
+       dbg_nointest=1;\r
+#endif\r
 \r
 #define FADE\r
 //#define NOMAPLOAD\r
@@ -40,7 +45,8 @@ unsigned int i;
 //static word paloffset=0;\r
 #endif\r
 byte *ptr;\r
-memptr pal;\r
+//memptr pal;\r
+boolean spriteswitch=0;\r
 \r
 #define FILENAME_1     "data/spri/chikyuu.vrs"\r
 #define FILENAME_1P    "data/spri/chikyuu.pal"\r
@@ -134,7 +140,7 @@ 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(&gvar.mv, 0, 0);\r
 \r
-       ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);\r
+       ZC_PlayerXYpos(0, 0, &gvar.player[0], &gvar.mv, 1);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
        //print_anim_ids(gvar.player[0].enti.spri);\r
        if (gvar.video.sprifilei == -1)\r
@@ -189,14 +195,12 @@ void main(int argc, char *argv[])
                }\r
                if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
                //debugging binds!\r
-\r
-               if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ VL_LoadPalFileCore(&gvar.video.palette, &gvar); modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
+//             if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ VL_LoadPalFileCore(&gvar.video.palette, &gvar); modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
                if(gvar.in.inst->Keyboard[22]){ VL_modexPalScramble(&gvar.video.palette); VL_LoadPalFileCore(&gvar.video.palette, &gvar); } //u\r
 \r
                TAIL_FUNCTIONKEYFUNCTIONS\r
                TAIL_FUNCTIONKEYDRAWJUNK\r
                if(gvar.in.inst->Keyboard[sc_L]){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }\r
-               if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                               IN_UserInput(1, &gvar); }\r
 \r
 //===============================================================================\r
 #if 0\r
@@ -215,31 +219,36 @@ void main(int argc, char *argv[])
 #endif\r
 //===============================================================================\r
 \r
-               if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])\r
+               if(gvar.in.inst->Keyboard[sc_J])// || gvar.in.inst->Keyboard[sc_K])\r
                {\r
-                       if(gvar.in.inst->Keyboard[sc_J])\r
+                       if(spriteswitch)//gvar.in.inst->Keyboard[sc_J])\r
                        {\r
                                strcpy(bakapee, FILENAME_1);\r
                                strcpy(bakapeep, FILENAME_1P);\r
                                gvar.player[0].enti.overdraww=0;\r
                        }\r
-                       if(gvar.in.inst->Keyboard[sc_K])\r
+                       else//if(gvar.in.inst->Keyboard[sc_K])\r
                        {\r
                                strcpy(bakapee, FILENAME_2);\r
                                strcpy(bakapeep, FILENAME_2P);\r
                                gvar.player[0].enti.overdraww=2;\r
                        }\r
+                       spriteswitch=!spriteswitch;\r
+\r
                        //read_vrs(&gvar, bakapee, gvar.player[0].enti.spri->spritesheet);\r
                        VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
                        VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);\r
                        ZC_animatePlayer(&gvar.mv, &gvar.player, 0);\r
+                       IN_UserInput(1, &gvar);\r
                }//JK\r
 //#ifdef FADE\r
 //             if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r
 //#endif\r
                if(gvar.in.inst->Keyboard[sc_R]){ VL_modexPalOverscan(&gvar.video.palette, rand()%32); } //r\r
 \r
-               if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;  //incase things go out of sync!\r
+\r
+               //if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;        //incase things go out of sync!\r
+               ZC_GirdChk(&gvar, &gvar.player[0]);\r
        }\r
 \r
        /* fade back to text mode */\r