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 542301c18ef91e8f7fbe5c3fdbfdb6c046aa441a..cea177952143b533421527c59e0c2945e720a43b 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,6 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/16render.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
 #define FADE\r
@@ -53,28 +52,14 @@ void main(int argc, char *argv[])
 {\r
        static global_game_variables_t gvar;\r
        struct glob_game_vars *ggvv;\r
-//     sword bakapee;\r
-//     if(argv[1]) bakapee = atoi(argv[1]);\r
-//     else bakapee = 1;\r
-       //char *bakapee1,*bakapee1p;\r
        char bakapee1[64] = FILENAME_1;\r
        char bakapee1p[64] = FILENAME_1P;\r
 \r
        Startup16(&gvar);\r
 \r
-//     bakapee1=mALLoc(64);\r
-//     bakapee1p=mALLoc(64);\r
        ggvv=&gvar;\r
 \r
        if (argc >= 2) {\r
-/*     if (argc < 2) {\r
-               //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
-               bakapee1 =              FILENAME_1;\r
-               bakapee1p =     FILENAME_1P;\r
-\r
-       }else{\r
-               if(argv[1]) bakapee1 = argv[1];\r
-               if(argv[2]) bakapee1p = argv[2];*/\r
                if(argv[1]){ strcpy(bakapee1, argv[1]);\r
                if(argv[2]) strcpy(bakapee1p, argv[2]); }\r
        }\r
@@ -136,9 +121,7 @@ void main(int argc, char *argv[])
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 \r
-       IN_StartAck (&gvar);\r
-       MM_ShowMemory(&gvar);\r
-       while (!IN_CheckAck (&gvar)){}\r
+//     IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
 #ifdef FADE\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
@@ -203,12 +186,13 @@ void main(int argc, char *argv[])
                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;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
-               if(gvar.in.inst->Keyboard[22]){ VL_modexPalScramble(&gvar.video.palette); } //u\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_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_J] || gvar.in.inst->Keyboard[sc_K])\r
                {\r
                        if(gvar.in.inst->Keyboard[sc_J])\r