16_pm is now in exmmtest.exe and major studying of how it behaves is needed to functi...

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 55dca2cd63f09aacf2f55ea9974a96e576510f60..e2803808a47389d6202f2f870c3dfbea4fb445d6 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -226,7 +226,7 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variab
        boolean flag;\r
        //dword fat=0;\r
        //word segm=0;\r
-       if(gvar->mm.EMSVer<0x40)\r
+       if(gvar->pm.emm.EMSVer<0x40)\r
        if(length>0xfffflu)\r
        {\r
                printf("File is a fat bakapee\n");\r
@@ -298,7 +298,7 @@ boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_var
        boolean flag;\r
        //dword fat=0;\r
        //word segm=0;\r
-       if(gvar->mm.EMSVer<0x40)\r
+       if(gvar->pm.emm.EMSVer<0x40)\r
        if(length>0xfffflu)\r
        {\r
                printf("File is a fat bakapee\n");\r
@@ -437,8 +437,8 @@ boolean CA_LoadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
        if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                return false;\r
 \r
-       size = filelength (handle);\r
-       MM_GetPtr(ptr,size, &(gvar->mm), &(gvar->mmi)); //TODO: gvar parameters\r
+       size = filelength(handle);\r
+       MM_GetPtr(ptr,size, gvar);\r
        if(!CA_FarRead(handle,*ptr,size, gvar))\r
        {\r
                close(handle);\r