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

diff --git a/makefile b/makefile
index 2a083bc16f809e49f2463e3e015150be592099d0..27e487c85e3b3da2d3b05de0066805c4fd7fac8d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -193,6 +193,8 @@ TESTEXEC = &
        xcroll.exe &
        inputest.exe &
        vrstest.exe &
+       tesuto.exe &
+       0.exe &
        maptest.exe
 #zcroll.exe &
 TESTEXEC2 = &
@@ -202,8 +204,6 @@ TESTEXEC2 = &
        fonttest.exe &
        fontgfx.exe &
        test0.exe &
-       tesuto.exe &
-       0.exe &
        $(EXTERNTESTEXEC)
 TESTEXEC3= &
        pcxtest2.exe

diff --git a/src/0.c b/src/0.c
index 051bb332fe8be6ff3e01a5e3d1f84e7a54658b20..69e6e39ec75bcd7e06873c4bec326d0e6c536134 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -46,21 +46,18 @@ int main(int argc,char **argv)
        unsigned int bufsz;\r
        int fd;\r
        //nibble i;\r
-       char *bakapee1,*bakapee2;\r
+       char bakapee1[64],bakapee2[64];\r
 \r
        boolean anim=1,noanim=0,zerostoppause=1;\r
 \r
-       bakapee1=malloc(64);\r
-       bakapee2=malloc(64);\r
-\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
+               strcpy(bakapee1, FILENAME_1);//"data/aconita.vrl";\r
+               strcpy(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
 \r
        fd = open(bakapee1,O_RDONLY|O_BINARY);\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 106ebab73a61822f53757a54fdd1e7576959853c..0e7bb0ce5acb22820d37f2b7c1252259081a10cf 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -110,6 +110,8 @@ void segatesuto()
 }\r
 #endif\r
 \r
+\r
+\r
 void\r
 main(int argc, char *argv[])\r
 {\r
@@ -125,17 +127,12 @@ main(int argc, char *argv[])
 //#ifdef __WATCOMC__\r
 //     __segment sega;\r
 //#endif\r
-       //static byte bakapee[64];\r
-       char *bakapee1, *bakapee2;\r
+       char bakapee1[64],bakapee2[64];\r
        word baka;\r
 \r
 #ifdef __BORLANDC__\r
        argc=argc;\r
 #endif\r
-       //file name //\r
-       bakapee1 = malloc(24);\r
-       bakapee2 = malloc(24);\r
-       //file name //\r
 \r
 #ifdef __16_PM__\r
 #ifdef __DEBUG_PM__\r
@@ -149,12 +146,12 @@ main(int argc, char *argv[])
 #ifdef PRINTBBDUMP\r
 //0000PRINTBB; KEYP\r
 #endif\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
        else{\r
        //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
-               bakapee1 = "data/koishi~.pcx";\r
-               bakapee2 = "data/test.map";\r
+               strcpy(bakapee1, "data/koishi~.pcx"); //bakapee1 = "data/koishi~.pcx";\r
+               strcpy(bakapee2, "data/test.map"); //bakapee2 = "data/test.map";\r
        }\r
 #ifndef NOVID\r
        Startup16(&gvar);\r

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