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 7a9d4778a0f52e6efc52917e9768ea60eb132b9a..b35486206887c1c214e97c0cccd90ed0c5488319 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -46,16 +46,24 @@ int main(int argc,char **argv)
        unsigned int bufsz;\r
        int fd;\r
        //nibble i;\r
-       char bakapee1[64],bakapee2[64];\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
-       if (argc < 2) {\r
+//     bakapee1=mALLoc(64);\r
+//     bakapee2=mALLoc(64);\r
+\r
+       if (argc >= 2) {\r
+/*     if (argc < 2) {\r
                //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
-               strcpy(bakapee1, FILENAME_1);//"data/aconita.vrl";\r
-               strcpy(bakapee2, FILENAME_2);//"data/aconita.pal";\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[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];\r
                if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }\r
        }\r
@@ -89,10 +97,10 @@ 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
@@ -304,6 +312,7 @@ if(!noanim) {
        buffer = NULL;\r
        free(buffer);\r
        bufsz = 0;\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