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 cea177952143b533421527c59e0c2945e720a43b..e31ff558c51125bcf315ccce367c9905bea395db 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -27,7 +27,6 @@
 #define FADE\r
 //#define NOMAPLOAD\r
 \r
-//map_view_t mv[4];\r
 static map_t map;\r
 float t;\r
 \r
@@ -47,21 +46,26 @@ 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
 \r
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
        struct glob_game_vars *ggvv;\r
-       char bakapee1[64] = FILENAME_1;\r
-       char bakapee1p[64] = FILENAME_1P;\r
+\r
+//     static entity_t enti;\r
+\r
+       char bakapee[64] = FILENAME_1;\r
+       char bakapeep[64] = FILENAME_1P;\r
+       char bakapee3[64] = FILENAME_3;\r
 \r
        Startup16(&gvar);\r
 \r
        ggvv=&gvar;\r
 \r
        if (argc >= 2) {\r
-               if(argv[1]){ strcpy(bakapee1, argv[1]);\r
-               if(argv[2]) strcpy(bakapee1p, argv[2]); }\r
+               if(argv[1]){ strcpy(bakapee, argv[1]);\r
+               if(argv[2]) strcpy(bakapeep, argv[2]); }\r
        }\r
 \r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
@@ -81,7 +85,8 @@ void main(int argc, char *argv[])
        //initMap(&map);\r
 #endif\r
        // data\r
-       VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\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
@@ -104,7 +109,7 @@ void main(int argc, char *argv[])
        //printf("1:    %d\n", paloffset);\r
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
-       VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);\r
+       VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);\r
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
@@ -121,7 +126,7 @@ void main(int argc, char *argv[])
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 \r
-//     IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
+//0000 IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
 #ifdef FADE\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
@@ -191,29 +196,43 @@ void main(int argc, char *argv[])
 \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_L]){ ShowPalVal (&gvar);                                                           IN_UserInput(1, &gvar); }\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
+\r
+               if(gvar.in.inst->Keyboard[sc_BackSlash]){\r
+                       VRS_ReadVRL(bakapee3, &gvar.player[0].enti, &gvar);\r
+                       DrawVRL(\r
+                               gvar.player[0].enti.x,\r
+                               gvar.player[0].enti.y,\r
+                               gvar.player[0].enti.spri.sprite_vrl_cont.vrl_header,\r
+                               gvar.player[0].enti.spri.sprite_vrl_cont.line_offsets,\r
+                               gvar.player[0].enti.spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header),\r
+                               gvar.player[0].enti.spri.sprite_vrl_cont.data_size\r
+                       );      while (!IN_CheckAck (&gvar)){}\r
+                       VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
+               IN_UserInput(1, &gvar); }\r
+\r
+//===============================================================================\r
+\r
                if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])\r
                {\r
                        if(gvar.in.inst->Keyboard[sc_J])\r
                        {\r
-//                             bakapee1=FILENAME_1;\r
-//                             bakapee1p=FILENAME_1P;\r
-                               strcpy(bakapee1, FILENAME_1);\r
-                               strcpy(bakapee1p, FILENAME_1P);\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
                        {\r
-//                             bakapee1=FILENAME_2;\r
-//                             bakapee1p=FILENAME_2P;\r
-                               strcpy(bakapee1, FILENAME_2);\r
-                               strcpy(bakapee1p, FILENAME_2P);\r
+                               strcpy(bakapee, FILENAME_2);\r
+                               strcpy(bakapeep, FILENAME_2P);\r
                                gvar.player[0].enti.overdraww=2;\r
                        }\r
-                       //read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);\r
-                       VRS_ReadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
-                       VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);\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
                }//JK\r
 #ifdef FADE\r
                if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r