Merge remote-tracking branch 'upstream/master'

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 78fa104fdb4dd8257c93b6a9dcf3bcf8d6d1cc5f..02fafeb6aa1b63db68c9d010b2154a99d75b0afc 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -64,7 +64,7 @@ void segatesuto()
 void\r
 main(int argc, char *argv[])\r
 {\r
-       byte w;\r
+       byte w=1;\r
        global_game_variables_t gvar;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
@@ -72,21 +72,27 @@ main(int argc, char *argv[])
        memptr bigbuffer;\r
 \r
        //static byte bakapee[64];\r
-       char *bakapee;\r
+       char *bakapee1, *bakapee2;\r
        word baka;\r
 \r
 #ifdef __BORLANDC__\r
        argc=argc;\r
 #endif\r
-       bakapee = malloc(64);\r
+       //file name //\r
+       bakapee1 = malloc(64);\r
+       bakapee2 = malloc(64);\r
+       //file name //\r
+\r
        gvar.mm.mmstarted=0;\r
 \r
        //PRINTBB\r
-       if(argv[1]) bakapee = argv[1];\r
-       else\r
+       if(argv[1]){ bakapee1 = argv[1];\r
+       if(argv[2]) bakapee2 = argv[2]; }\r
+       else{\r
        //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
-       bakapee = "data/koishi~.pcx";\r
-\r
+               bakapee1 = "data/koishi~.pcx";\r
+               bakapee2 = "data/test.map";\r
+       }\r
 //     printf("main()=%Fp      start MM\n", *argv[0]);\r
        MM_Startup(&gvar.mm, &gvar.mmi);\r
        //PM_Startup();\r
@@ -105,11 +111,14 @@ for(w=0;w<2;w++)
        if(w>0)\r
        {\r
                printf("                read\n");\r
-               if(CA_ReadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+               if(CA_ReadFile(bakapee2, &bigbuffer, &gvar)) baka=1; else baka=0;\r
        }\r
 #endif\r
+       if(w==0)\r
+       {\r
        printf("                load\n");\r
-       if(CA_LoadFile(bakapee, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+       if(CA_LoadFile(bakapee1, &bigbuffer, &gvar)) baka=1; else baka=0;\r
+       }\r
 //     close(bakapeehandle);\r
        //hmm functions in cache system use the buffered stuff\r
 #ifdef __WATCOMC__\r
@@ -125,6 +134,8 @@ for(w=0;w<2;w++)
        MM_ShowMemory(&gvar, &gvar.mm);\r
        MM_DumpData(&gvar.mm);\r
        MM_Report(&gvar);\r
+       if(baka) printf("\nyay!\n");\r
+       else printf("\npoo!\n");\r
        printf("press any key to continue!\n");\r
        getch();\r
 #ifdef FILEREAD\r
@@ -134,9 +145,7 @@ for(w=0;w<2;w++)
        //PM_Shutdown();\r
        CA_Shutdown(&gvar);\r
        MM_Shutdown(&gvar.mm);\r
-       free(bakapee);\r
-       if(baka) printf("\nyay!\n");\r
-       else printf("\npoo!\n");\r
+       free(bakapee1); free(bakapee2);\r
        printf("========================================\n");\r
        printf("near=   %Fp ", gvar.mm.nearheap);\r
        printf("far=    %Fp", gvar.mm.farheap);\r