reverted to older ver of 16_mm because of bugs

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 139b72c8c9701b270a0dc307f9a5d523b66efb12..e699fcbf69ba6b9041a6eefbcb79bbc53d9942eb 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -44,9 +44,9 @@
 \r
 //     XMS specific variables\r
        boolean                 gvar->pm.xmm.XMSPresent;\r
-       word                    gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
-       dword           XMSDriver;\r
-       int                             gvar->pm.xmm.XMSProtectPage = -1;\r
+       word                    gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;*/\r
+       word            XMSDriver;\r
+/*     int                             gvar->pm.xmm.XMSProtectPage = -1;\r
 \r
 //     File specific variables\r
        char                    gvar->pm.fi.PageFileName[13] = {"VSWAP."};\r
@@ -293,7 +293,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
+       //XMSD;\r
        gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
        gvar->pm.xmm.XMSAvail = 0;\r
 \r
@@ -310,7 +310,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
                mov     [WORD PTR XMSDriver+2],es               // function pointer to XMS driver\r
        }\r
 \r
-       XMS_CALL(XMS_QUERYFREE, gvar);                  // Find out how much XMS is available\r
+       XMS_CALL(XMS_QUERYFREE);                        // Find out how much XMS is available\r
        gvar->pm.xmm.XMSAvail = _AX;\r
        if (!_AX)                               // AJR: bugfix 10/8/92\r
                goto error;\r
@@ -320,7 +320,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
                goto error;\r
 \r
        _DX = gvar->pm.xmm.XMSAvail;\r
-       XMS_CALL(XMS_ALLOC, gvar);                              // And do the allocation\r
+       XMS_CALL(XMS_ALLOC);                            // And do the allocation\r
        gvar->pm.xmm.XMSHandle = _DX;\r
 \r
        if (!_AX)                               // AJR: bugfix 10/8/92\r
@@ -344,7 +344,7 @@ void
 PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_variables_t *gvar)\r
 {\r
 #ifdef __WATCOMC__\r
-       XMSD;\r
+       //XMSD;\r
 #endif\r
        dword   xoffset;\r
        struct\r
@@ -374,7 +374,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
                push si\r
        }\r
        _SI = (word)©\r
-       XMS_CALL(XMS_MOVE, gvar);\r
+       XMS_CALL(XMS_MOVE);\r
        __asm {\r
                pop     si\r
        }\r
@@ -416,11 +416,11 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void\r
 PML_ShutdownXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
+       //XMSD;\r
        if (gvar->pm.xmm.XMSPresent)\r
        {\r
                _DX = gvar->pm.xmm.XMSHandle;\r
-               XMS_CALL(XMS_FREE, gvar);\r
+               XMS_CALL(XMS_FREE);\r
                if (_BL)\r
                {\r
                        Quit("PML_ShutdownXMS: Error freeing XMS");\r
@@ -1277,6 +1277,9 @@ PM_Reset(global_game_variables_t *gvar)
 \r
        gvar->pm.PMPanicMode = false;\r
 \r
+       gvar->pm.fi.PageFile = -1;\r
+       gvar->pm.xmm.XMSProtectPage = -1;\r
+\r
        // Initialize page list\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.PMNumBlocks;i++,page++)\r
        {\r
@@ -1300,8 +1303,6 @@ PM_Startup(global_game_variables_t *gvar)
                return;\r
 \r
        strcat(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
-       gvar->pm.fi.PageFile = -1;\r
-       gvar->pm.xmm.XMSProtectPage = -1;\r
 \r
        nomain = noems = noxms = false;\r
        for (i = 1;i <\r