p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / 0.c

diff --git a/src/0.c b/src/0.c
index fc9b2e927a62d7692e95da1e3ceeabcb46951f50..b35486206887c1c214e97c0cccd90ed0c5488319 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -46,21 +46,26 @@ int main(int argc,char **argv)
        unsigned int bufsz;\r
        int fd;\r
        //nibble i;\r
-       char *bakapee1,*bakapee2;\r
+       //char *bakapee1,*bakapee2;\r
+       char bakapee1[64] = FILENAME_1;\r
+       char bakapee2[64] = FILENAME_2;\r
 \r
        boolean anim=1,noanim=0,zerostoppause=1;\r
 \r
-       bakapee1=malloc(64);\r
-       bakapee2=malloc(64);\r
+//     bakapee1=mALLoc(64);\r
+//     bakapee2=mALLoc(64);\r
 \r
-       if (argc < 2) {\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;//"data/aconita.vrl";\r
                bakapee2 = FILENAME_2;//"data/aconita.pal";\r
 \r
        }else{\r
                if(argv[1]) bakapee1 = argv[1];\r
-               if(argv[2]) bakapee2 = argv[2];\r
+               if(argv[2]) bakapee2 = argv[2];*/\r
+               if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];\r
+               if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }\r
        }\r
 \r
        fd = open(bakapee1,O_RDONLY|O_BINARY);\r
@@ -92,23 +97,23 @@ int main(int argc,char **argv)
                return 1;\r
        }\r
        VGAmodeX(1, 1, &gvar);\r
-       modexPalUpdate0(gvar.video.palette);\r
+       VL_modexPalScramble(gvar.video.palette);\r
 \r
        /* load color palette */\r
-       VL_LoadPalFile(bakapee2, &gvar.video.palette);\r
+       VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);\r
 \r
        /* preprocess the sprite to generate line offsets */\r
        vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
        if (vrl_lineoffs == NULL) return 1;\r
 \r
-       IN_Startup();\r
-       IN_Default(0,&gvar.player[0],ctrl_Keyboard1);\r
+       IN_Startup(&gvar);\r
+       IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&MVVAR, &map, &gvar);\r
-       ZC_ShowMV(&MVVAR, gvar.video.sp, 0);\r
+       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
+       ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
 \r
 //     VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
        VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);\r
@@ -138,20 +143,20 @@ int main(int argc,char **argv)
                /* do it */\r
                omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
 \r
-               while(!IN_KeyDown(sc_Escape))\r
+               while(!gvar.in.inst->Keyboard[sc_Escape])\r
                {\r
-                       IN_ReadControl(&gvar.player[0]);\r
-                       if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1); } //f10\r
+                       IN_ReadControl(&gvar.player[0], &gvar);\r
+                       if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
                        TAIL_PANKEYFUN;\r
-                       if(IN_KeyDown(sc_Space) || zerostoppause)       //space\r
+                       if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)   //space\r
                        {\r
                                anim=!anim;\r
                                DRAWCORNERBOXES;\r
-                               if(!zerostoppause) IN_UserInput(1); else zerostoppause=0;\r
+                               if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;\r
                        }\r
-                       if(IN_KeyDown(sc_R)){\r
+                       if(gvar.in.inst->Keyboard[sc_R]){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
-                               MVVAR[0].tx = MVVAR[0].ty = MVVAR[1].tx = MVVAR[1].ty = INITTNUM;\r
+                               gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;\r
                                VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);\r
                                gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2;\r
                                x=y=0;\r
@@ -213,11 +218,11 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
                }\r
        }\r
 \r
-       IN_UserInput(1);\r
+       IN_UserInput(1, &gvar);\r
 \r
 //===========================================================================//\r
 \r
-       ZC_ShowMV(&MVVAR, 0, 0);\r
+       ZC_ShowMV(&gvar.mv, 0, 0);\r
 if(!noanim) {\r
        /* another handy "demo" effect using VGA write mode 1.\r
         * we can take what's on screen and vertically squash it like an old analog TV set turning off. */\r
@@ -301,18 +306,17 @@ if(!noanim) {
                }\r
        }\r
 }\r
-       IN_Shutdown();\r
+       IN_Shutdown(&gvar);\r
        VGAmodeX(0, 1, &gvar);\r
        free(vrl_lineoffs);\r
        buffer = NULL;\r
        free(buffer);\r
        bufsz = 0;\r
-       free(bakapee1);\r
-       free(bakapee2);\r
+//     free(bakapee1); free(bakapee2);\r
        printf("\nProject 16 0.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        //SCROLLEXITMESG;\r
-       printf("mv 0\n- tx=%d   ty=%d   dx=%d   dy=%d\n", MVVAR[0].tx, MVVAR[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);\r
-       printf("mv 1\n- tx=%d   ty=%d   dx=%d   dy=%d\n", MVVAR[1].tx, MVVAR[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);\r
+       printf("mv 0\n- tx=%d   ty=%d   dx=%d   dy=%d\n", gvar.mv[0].tx, gvar.mv[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);\r
+       printf("mv 1\n- tx=%d   ty=%d   dx=%d   dy=%d\n", gvar.mv[1].tx, gvar.mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);\r
        return 0;\r
 }\r