16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index e31ff558c51125bcf315ccce367c9905bea395db..9416cf9ee5ab38a1477f7931a4bfd8eab5e0b113 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -46,7 +46,7 @@ memptr pal;
 #define FILENAME_1P    "data/spri/chikyuu.pal"\r
 #define FILENAME_2     "data/spri/me.vrs"\r
 #define FILENAME_2P    "data/spri/me.pal"\r
-#define FILENAME_3     "data/spri/chistnd.vrl"\r
+//#define FILENAME_3   "data/spri/chistnd.vrl"\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -57,7 +57,7 @@ void main(int argc, char *argv[])
 \r
        char bakapee[64] = FILENAME_1;\r
        char bakapeep[64] = FILENAME_1P;\r
-       char bakapee3[64] = FILENAME_3;\r
+//     char bakapee3[64] = FILENAME_3;\r
 \r
        Startup16(&gvar);\r
 \r
@@ -86,7 +86,6 @@ void main(int argc, char *argv[])
 #endif\r
        // data\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
-//     VRS_LoadVRS(bakapee3, &enti, &gvar);\r
 \r
        // input!\r
        IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
@@ -200,7 +199,7 @@ void main(int argc, char *argv[])
                if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                               IN_UserInput(1, &gvar); }\r
 \r
 //===============================================================================\r
-\r
+#if 0\r
                if(gvar.in.inst->Keyboard[sc_BackSlash]){\r
                        VRS_ReadVRL(bakapee3, &gvar.player[0].enti, &gvar);\r
                        DrawVRL(\r
@@ -213,7 +212,7 @@ void main(int argc, char *argv[])
                        );      while (!IN_CheckAck (&gvar)){}\r
                        VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
                IN_UserInput(1, &gvar); }\r
-\r
+#endif\r
 //===============================================================================\r
 \r
                if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])\r
@@ -233,11 +232,12 @@ void main(int argc, char *argv[])
                        //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
                }//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]){ modexPalOverscan(rand()%56); } //r\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