branch is in the master swap branch code added to swap the files out ^^

[16.git] / src / exmmtest.c

diff --git a/src/exmmtest.c b/src/exmmtest.c
index fb8a1ee1651902c94ea6a6a3d57fd577f1cf1a41..35701796b5e39ebca32ecb289dd03dc4a1745d05 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -44,7 +44,6 @@ global_game_variables_t gvar;
 void\r
 main(int argc, char *argv[])\r
 {\r
-       mminfo_t mm; mminfotype mmi;\r
 #ifdef __WATCOMC__\r
        __segment sega;\r
        void __based(sega)* bigbuffer;\r
@@ -71,7 +70,7 @@ main(int argc, char *argv[])
 #ifdef FILERL\r
        bakapee = malloc(64);\r
 #endif\r
-       mm.mmstarted=0;\r
+       gvar.mm.mmstarted=0;\r
 \r
 #ifdef FILERL\r
 //     printf("filename!: ");\r
@@ -89,7 +88,7 @@ main(int argc, char *argv[])
        //screen.height += (16*2);\r
 \r
 //     printf("main()=%Fp      start MM\n", *argv[0]);\r
-       MM_Startup(&mm, &mmi);\r
+       MM_Startup(&gvar.mm, &gvar.mmi);\r
        //PM_Startup();\r
        //PM_UnlockMainMem();\r
        CA_Startup(&gvar);\r
@@ -103,13 +102,13 @@ main(int argc, char *argv[])
 #ifdef FILERL\r
 //     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);\r
 //     printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));\r
-//     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))\r
+//     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&gvar.mm))\r
 #ifdef FILEREAD\r
        printf("                read\n");\r
-       if(CA_ReadFile(bakapee, &bigbuffer, &mm))\r
+       if(CA_ReadFile(bakapee, &bigbuffer, &gvar.mm))\r
 #else\r
        printf("                load\n");\r
-       if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))\r
+       if(CA_LoadFile(bakapee, &bigbuffer, &gvar.mm, &gvar.mmi))\r
 #endif\r
                baka=1;\r
        else\r
@@ -130,18 +129,18 @@ main(int argc, char *argv[])
        getch();\r
        //++++modexEnter();\r
        //++++modexShowPage(&screen);\r
-       MM_ShowMemory(&gvar, &mm);\r
+       MM_ShowMemory(&gvar, &gvar.mm);\r
        //getch();\r
-       MM_DumpData(&mm);\r
+       MM_DumpData(&gvar.mm);\r
        //++++modexLeave();\r
-       //++++MM_Report(&mm, &mmi);\r
+       //++++MM_Report(&gvar.mm, &gvar.mmi);\r
 //     printf("                stop!\n");\r
 #ifdef FILERL\r
-       MM_FreePtr(&bigbuffer, &mm);\r
+       MM_FreePtr(&bigbuffer, &gvar.mm);\r
 #endif\r
        //PM_Shutdown();\r
        CA_Shutdown(&gvar);\r
-       MM_Shutdown(&mm);\r
+       MM_Shutdown(&gvar.mm);\r
 //     printf("                done!\n");\r
 #ifdef FILERL\r
        free(bakapee);\r
@@ -149,11 +148,11 @@ main(int argc, char *argv[])
        else printf("\npoo!\n");\r
 #endif\r
        printf("========================================\n");\r
-       printf("near=   %Fp ", mm.nearheap);\r
-       printf("far=    %Fp", mm.farheap);\r
+       printf("near=   %Fp ", gvar.mm.nearheap);\r
+       printf("far=    %Fp", gvar.mm.farheap);\r
        printf("\n");\r
-       printf("&near=  %Fp ", &(mm.nearheap));\r
-       printf("&far=   %Fp", &(mm.farheap));\r
+       printf("&near=  %Fp ", &(gvar.mm.nearheap));\r
+       printf("&far=   %Fp", &(gvar.mm.farheap));\r
        printf("\n");\r
        printf("bigb=   %Fp ", bigbuffer);\r
        //printf("bigbr=        %04x", bigbuffer);\r