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

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index fcc7778de5ba2f036c20998e128ed4210be54186..f8ee37b266a7068e1f3af049d4d7f6767343b5b5 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -51,7 +51,7 @@ memptr pal;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       char *bakapee1,*bakapee1p;\r
+       char bakapee1[64],bakapee1p[64];\r
        struct glob_game_vars   *ggvv;\r
 //     sword bakapee;\r
 //     if(argv[1]) bakapee = atoi(argv[1]);\r
@@ -59,18 +59,16 @@ void main(int argc, char *argv[])
 \r
        Startup16(&gvar);\r
 \r
-       bakapee1=malloc(64);\r
-       bakapee1p=malloc(64);\r
        ggvv=&gvar;\r
 \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
+               strcpy(bakapee1, FILENAME_1);\r
+               strcpy(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
 \r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
@@ -190,14 +188,14 @@ void main(int argc, char *argv[])
                {\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
                                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
                                gvar.player[0].enti.overdraww=2;\r
                        }\r
                        //read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);\r