]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_pm.c
16_pm is now in exmmtest.exe and major studying of how it behaves is needed to functi...
[16.git] / src / lib / 16_pm.c
index 0b04b16eee30a37f53a12a4d1334a926e8fd90f0..9740195156dc584e7a15d26a248dbe76289c2028 100755 (executable)
@@ -1,3 +1,25 @@
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
 //\r
 //     ID_PM.C\r
 //     Id Engine's Page Manager v1.0\r
 \r
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\r
+union REGS CPURegs;\r
 /*\r
 //     Main Mem specific variables\r
        boolean                 MainPresent;\r
        memptr                  MainMemPages[PMMaxMainMem];\r
-       PMBlockAttr             MainMemUsed[PMMaxMainMem];\r
-       int                             MainPagesAvail;\r
+       PMBlockAttr             gvar->pm.mm.MainMemUsed[PMMaxMainMem];\r
+       int                             gvar->pm.mm.MainPagesAvail;\r
 \r
 //     EMS specific variables\r
        boolean                 gvar->pm.emm.EMSPresent;\r
        word                    gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle,\r
                                        gvar->pm.emm.EMSPageFrame,gvar->pm.emm.EMSPhysicalPage;\r
-       EMSListStruct   EMSList[EMSFrameCount];\r
+       gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];\r
 \r
 //     XMS specific variables\r
        boolean                 gvar->pm.xmm.XMSPresent;\r
        int                             gvar->pm.xmm.XMSProtectPage = -1;\r
 \r
 //     File specific variables\r
-       char                    PageFileName[13] = {"VSWAP."};\r
+       char                    gvar->pm.fi.PageFileName[13] = {"VSWAP."};\r
        int                             PageFile = -1;\r
        word                    gvar->pm.fi.ChunksInFile;\r
        word                    PMSpriteStart,PMSoundStart;\r
 \r
 //     General usage variables\r
        boolean                 PMStarted,\r
-                                       PMPanicMode,\r
-                                       PMThrashing;\r
-       word                    gvar->pm.xmm.XMSPagesUsed,\r
-                                       gvar->pm.emm.EMSPagesUsed,\r
+                                       gvar->pm.PMPanicMode,\r
+                                       gvar->pm.PMThrashing;\r
+       word                    gvar->pm.XMSPagesUsed,\r
+                                       gvar->pm.EMSPagesUsed,\r
                                        MainPagesUsed,\r
-                                       PMNumBlocks;\r
+                                       gvar->pm.PMNumBlocks;\r
        long                    PMFrameCount;\r
-       PageListStruct  far *PMPages,\r
-                                       _seg *PMSegPages;\r
+       PageListStruct  far *gvar->pm.PMPages,\r
+                                       _seg *gvar->pm.PMSegPages;\r
 */\r
 static char            *ParmStrings[] = {"nomain","noems","noxms",nil};\r
 \r
@@ -62,8 +85,7 @@ PML_MapEMS(word logical, word physical, global_game_variables_t *gvar)
        CPURegs.x.bx = logical;\r
        CPURegs.x.dx = gvar->pm.emm.EMSHandle;\r
        CPURegs.h.ah = EMS_MAPPAGE;\r
-       __asm\r
-       {\r
+       __asm {\r
                int     EMS_INT\r
        }\r
 \r
@@ -257,7 +279,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);                        // Find out how much XMS is available\r
+       XMS_CALL(XMS_QUERYFREE, gvar);                  // Find out how much XMS is available\r
        gvar->pm.xmm.XMSAvail = CPURegs.x.ax;\r
        if (!CPURegs.x.ax)                              // AJR: bugfix 10/8/92\r
                goto error;\r
@@ -267,7 +289,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
                goto error;\r
 \r
        CPURegs.x.dx = gvar->pm.xmm.XMSAvail;\r
-       XMS_CALL(XMS_ALLOC);                            // And do the allocation\r
+       XMS_CALL(XMS_ALLOC, gvar);                              // And do the allocation\r
        gvar->pm.xmm.XMSHandle = CPURegs.x.dx;\r
 \r
        if (!CPURegs.x.ax)                              // AJR: bugfix 10/8/92\r
@@ -319,7 +341,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
                push si\r
        }\r
        CPURegs.x.si = (word)&copy;\r
-       XMS_CALL(XMS_MOVE);\r
+       XMS_CALL(XMS_MOVE, gvar);\r
        __asm {\r
                pop     si\r
        }\r
@@ -331,17 +353,17 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 }\r
 \r
 #if 1\r
-#define        PML_CopyToXMS(s,t,l)    PML_XMSCopy(true,(s),(t),(l))\r
-#define        PML_CopyFromXMS(t,s,l)  PML_XMSCopy(false,(t),(s),(l))\r
+#define        PML_CopyToXMS(s,t,l,gvar)       PML_XMSCopy(true,(s),(t),(l),(gvar))\r
+#define        PML_CopyFromXMS(t,s,l,gvar)     PML_XMSCopy(false,(t),(s),(l),(gvar))\r
 #else\r
 //\r
 //     PML_CopyToXMS() - Copies the specified number of bytes from the real mode\r
 //             segment address to the specified XMS page\r
 //\r
 void\r
-PML_CopyToXMS(byte far *source,int targetpage,word length)\r
+PML_CopyToXMS(byte far *source,int targetpage,word length,global_game_variables_t *gvar)\r
 {\r
-       PML_XMSCopy(true,source,targetpage,length);\r
+       PML_XMSCopy(true,source,targetpage,length, global_game_variables_t *gvar);\r
 }\r
 \r
 //\r
@@ -349,9 +371,9 @@ PML_CopyToXMS(byte far *source,int targetpage,word length)
 //             page to the specified real mode address\r
 //\r
 void\r
-PML_CopyFromXMS(byte far *target,int sourcepage,word length)\r
+PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variables_t *gvar)\r
 {\r
-       PML_XMSCopy(false,target,sourcepage,length);\r
+       PML_XMSCopy(false,target,sourcepage,length, global_game_variables_t *gvar);\r
 }\r
 #endif\r
 \r
@@ -365,7 +387,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
        if (gvar->pm.xmm.XMSPresent)\r
        {\r
                CPURegs.x.dx = gvar->pm.xmm.XMSHandle;\r
-               XMS_CALL(XMS_FREE);\r
+               XMS_CALL(XMS_FREE, gvar);\r
                if (CPURegs.h.bl)\r
                {\r
                        Quit("PML_ShutdownXMS: Error freeing XMS");\r
@@ -392,8 +414,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 \r
        for (i = 0;i < PMMaxMainMem;i++)\r
                if (gvar->pm.mm.MainMemPages[i])\r
-                       MM_SetPurge(&gvar->pm.mm.MainMemPages[i],level);\r
-       return 0;//TODO FIX\r
+                       MM_SetPurge(&gvar->pm.mm.MainMemPages[i],level, gvar);\r
 }\r
 \r
 //\r
@@ -410,7 +431,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 //             program makes allocation requests of the Memory Mgr.\r
 //\r
 void\r
-PM_CheckMainMem(void)\r
+PM_CheckMainMem(global_game_variables_t *gvar)\r
 {\r
        boolean                 allocfailed;\r
        int                             i,n;\r
@@ -418,15 +439,15 @@ PM_CheckMainMem(void)
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       if (!MainPresent)\r
+       if (!gvar->pm.mm.MainPresent)\r
                return;\r
 \r
-       for (i = 0,page = PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
        {\r
                n = page->mainPage;\r
                if (n != -1)                                            // Is the page using main memory?\r
                {\r
-                       if (!MainMemPages[n])                   // Yep, was the block purged?\r
+                       if (!gvar->pm.mm.MainMemPages[n])                       // Yep, was the block purged?\r
                        {\r
                                page->mainPage = -1;            // Yes, mark page as purged & unlocked\r
                                page->locked = pml_Unlocked;\r
@@ -435,41 +456,41 @@ PM_CheckMainMem(void)
        }\r
 \r
        // Prevent allocation attempts from purging any of our other blocks\r
-       PM_LockMainMem();\r
+       PM_LockMainMem(gvar);\r
        allocfailed = false;\r
-       for (i = 0,p = MainMemPages,used = MainMemUsed;i < PMMaxMainMem;i++,p++,used++)\r
+       for (i = 0,p = gvar->pm.mm.MainMemPages,used = gvar->pm.mm.MainMemUsed; i < PMMaxMainMem;i++,p++,used++)\r
        {\r
                if (!*p)                                                        // If the page got purged\r
                {\r
                        if (*used & pmba_Allocated)             // If it was allocated\r
                        {\r
                                *used &= ~pmba_Allocated;       // Mark as unallocated\r
-                               MainPagesAvail--;                       // and decrease available count\r
+                               gvar->pm.mm.MainPagesAvail--;                   // and decrease available count\r
                        }\r
 \r
                        if (*used & pmba_Used)                  // If it was used\r
                        {\r
                                *used &= ~pmba_Used;            // Mark as unused\r
-                               MainPagesUsed--;                        // and decrease used count\r
+                               gvar->pm.MainPagesUsed--;                       // and decrease used count\r
                        }\r
 \r
                        if (!allocfailed)\r
                        {\r
-                               MM_BombOnError(false);\r
-                               MM_GetPtr(p,PMPageSize);                // Try to reallocate\r
-                               if (mmerror)                                    // If it failed,\r
+                               MM_BombOnError(false, gvar);\r
+                               MM_GetPtr(p,PMPageSize, gvar);          // Try to reallocate\r
+                               if (gvar->mm.mmerror)                                   // If it failed,\r
                                        allocfailed = true;                     //  don't try any more allocations\r
                                else                                                    // If it worked,\r
                                {\r
                                        *used |= pmba_Allocated;        // Mark as allocated\r
-                                       MainPagesAvail++;                       // and increase available count\r
+                                       gvar->pm.mm.MainPagesAvail++;                   // and increase available count\r
                                }\r
-                               MM_BombOnError(true);\r
+                               MM_BombOnError(true, gvar);\r
                        }\r
                }\r
        }\r
-       if (mmerror)\r
-               mmerror = false;\r
+       if (gvar->mm.mmerror)\r
+               gvar->mm.mmerror = false;\r
 }\r
 \r
 //\r
@@ -479,31 +500,31 @@ PM_CheckMainMem(void)
 //             needs to be called.\r
 //\r
 void\r
-PML_StartupMainMem(void)\r
+PML_StartupMainMem(global_game_variables_t *gvar)\r
 {\r
        int             i,n;\r
        memptr  *p;\r
 \r
-       MainPagesAvail = 0;\r
-       MM_BombOnError(false);\r
-       for (i = 0,p = MainMemPages;i < PMMaxMainMem;i++,p++)\r
+       gvar->pm.mm.MainPagesAvail = 0;\r
+       MM_BombOnError(false, gvar);\r
+       for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
        {\r
-               MM_GetPtr(p,PMPageSize);\r
-               if (mmerror)\r
+               MM_GetPtr(p,PMPageSize, gvar);\r
+               if (gvar->mm.mmerror)\r
                        break;\r
 \r
-               MainPagesAvail++;\r
-               MainMemUsed[i] = pmba_Allocated;\r
+               gvar->pm.mm.MainPagesAvail++;\r
+               gvar->pm.mm.MainMemUsed[i] = pmba_Allocated;\r
        }\r
-       MM_BombOnError(true);\r
-       if (mmerror)\r
-               mmerror = false;\r
-       if (MainPagesAvail < PMMinMainMem)\r
+       MM_BombOnError(true, gvar);\r
+       if (gvar->mm.mmerror)\r
+               gvar->mm.mmerror = false;\r
+       if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)\r
        {\r
                Quit("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
-       MainPresent = true;\r
+       gvar->pm.mm.MainPresent = true;\r
 }\r
 \r
 //\r
@@ -511,15 +532,15 @@ PML_StartupMainMem(void)
 //             Page Mgr.\r
 //\r
 void\r
-PML_ShutdownMainMem(void)\r
+PML_ShutdownMainMem(global_game_variables_t *gvar)\r
 {\r
        int             i;\r
        memptr  *p;\r
 \r
        // DEBUG - mark pages as unallocated & decrease page count as appropriate\r
-       for (i = 0,p = MainMemPages;i < PMMaxMainMem;i++,p++)\r
+       for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
                if (*p)\r
-                       MM_FreePtr(p);\r
+                       MM_FreePtr(p, gvar);\r
 }\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -532,7 +553,7 @@ PML_ShutdownMainMem(void)
 //     PML_ReadFromFile() - Reads some data in from the page file\r
 //\r
 void\r
-PML_ReadFromFile(byte far *buf,long offset,word length)\r
+PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t *gvar)\r
 {\r
        if (!buf)\r
        {\r
@@ -544,12 +565,13 @@ PML_ReadFromFile(byte far *buf,long offset,word length)
                Quit("PML_ReadFromFile: Zero offset");\r
                //return;\r
        }\r
-       if (lseek(PageFile,offset,SEEK_SET) != offset)\r
+       if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)\r
        {\r
                Quit("PML_ReadFromFile: Seek failed");\r
                //return;\r
        }\r
-       if (!CA_FarRead(PageFile,buf,length))\r
+       if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))\r
+       {\r
                Quit("PML_ReadFromFile: Read failed");\r
                //return;\r
        }\r
@@ -559,73 +581,74 @@ PML_ReadFromFile(byte far *buf,long offset,word length)
 //     PML_OpenPageFile() - Opens the page file and sets up the page info\r
 //\r
 void\r
-PML_OpenPageFile(void)\r
+PML_OpenPageFile(global_game_variables_t *gvar)\r
 {\r
        int                             i;\r
        long                    size;\r
-                               __SEGA *buf;\r
+                               //__SEGA buf;\r
+       memptr          buf;\r
        dword           far *offsetptr;\r
        word                    far *lengthptr;\r
        PageListStruct  far *page;\r
 \r
-       PageFile = open(PageFileName,O_RDONLY + O_BINARY);\r
-       if (PageFile == -1)\r
+       gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);\r
+       if (gvar->pm.fi.PageFile == -1)\r
        {\r
                Quit("PML_OpenPageFile: Unable to open page file");\r
                //return;\r
        }\r
 \r
        // Read in header variables\r
-       read(PageFile,&gvar->pm.fi.ChunksInFile,sizeof(gvar->pm.fi.ChunksInFile));\r
-       read(PageFile,&PMSpriteStart,sizeof(PMSpriteStart));\r
-       read(PageFile,&PMSoundStart,sizeof(PMSoundStart));\r
+       read(gvar->pm.fi.PageFile,&gvar->pm.fi.ChunksInFile,sizeof(gvar->pm.fi.ChunksInFile));\r
+       read(gvar->pm.fi.PageFile,&gvar->pm.fi.PMSpriteStart,sizeof(gvar->pm.fi.PMSpriteStart));\r
+       read(gvar->pm.fi.PageFile,&gvar->pm.fi.PMSoundStart,sizeof(gvar->pm.fi.PMSoundStart));\r
 \r
        // Allocate and clear the page list\r
-       PMNumBlocks = gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr(&(memptr)PMSegPages,sizeof(PageListStruct) * PMNumBlocks);\r
-       MM_SetLock(&(memptr)PMSegPages,true);\r
-       PMPages = (PageListStruct far *)PMSegPages;\r
-       _fmemset(PMPages,0,sizeof(PageListStruct) * PMNumBlocks);\r
+       gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;\r
+       MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
+       MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);\r
+       gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;\r
+       _fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);\r
 \r
        // Read in the chunk offsets\r
        size = sizeof(dword) * gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr(&buf,size);\r
-       if (!CA_FarRead(PageFile,(byte far *)buf,size))\r
+       MM_GetPtr(&buf, size, gvar);\r
+       if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
                Quit("PML_OpenPageFile: Offset read failed");\r
                //return;\r
        }\r
        offsetptr = (dword far *)buf;\r
-       for (i = 0,page = PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->offset = *offsetptr++;\r
-       MM_FreePtr(&buf);\r
+       MM_FreePtr(&buf, gvar);\r
 \r
        // Read in the chunk lengths\r
        size = sizeof(word) * gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr(&buf,size);\r
-       if (!CA_FarRead(PageFile,(byte far *)buf,size))\r
+       MM_GetPtr(&buf,size, gvar);\r
+       if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
                Quit("PML_OpenPageFile: Length read failed");\r
                //return;\r
        }\r
        lengthptr = (word far *)buf;\r
-       for (i = 0,page = PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->length = *lengthptr++;\r
-       MM_FreePtr(&buf);\r
+       MM_FreePtr(&buf, gvar);\r
 }\r
 \r
 //\r
 //  PML_ClosePageFile() - Closes the page file\r
 //\r
 void\r
-PML_ClosePageFile(void)\r
+PML_ClosePageFile(global_game_variables_t *gvar)\r
 {\r
-       if (PageFile != -1)\r
-               close(PageFile);\r
-       if (PMSegPages)\r
+       if (gvar->pm.fi.PageFile != -1)\r
+               close(gvar->pm.fi.PageFile);\r
+       if (gvar->pm.PMSegPages)\r
        {\r
-               MM_SetLock(&(memptr)PMSegPages,false);\r
-               MM_FreePtr(&(__SEGA *)PMSegPages);\r
+               MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);\r
+               MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);\r
        }\r
 }\r
 \r
@@ -636,16 +659,16 @@ PML_ClosePageFile(void)
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 //\r
-//     PML_Getgvar->pm.emm.EMSAddress()\r
+//     PML_GetEMSAddress()\r
 //\r
 //             Page is in EMS, so figure out which EMS physical page should be used\r
 //             to map our page in. If normal page, use EMS physical page 3, else\r
 //             use the physical page specified by the lock type\r
 //\r
-#ifdef __DEBUG__\r
+#ifndef __DEBUG_2__\r
 #pragma argsused       // DEBUG - remove lock parameter\r
 memptr\r
-PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)\r
+PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)\r
 {\r
        int             i,emspage;\r
        word    emsoff,emsbase,offset;\r
@@ -657,7 +680,7 @@ PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)
        // See if this page is already mapped in\r
        for (i = 0;i < EMSFrameCount;i++)\r
        {\r
-               if (EMSList[i].basegvar->pm.emm.EMSPage == emsbase)\r
+               if (gvar->pm.emm.EMSList[i].baseEMSPage == emsbase)\r
                {\r
                        emspage = i;    // Yep - don't do a redundant remapping\r
                        break;\r
@@ -667,31 +690,31 @@ PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)
        // If page isn't already mapped in, find LRU EMS frame, and use it\r
        if (emspage == -1)\r
        {\r
-               dword last = MAXLONG;\r
+               dword last = LONG_MAX;\r
                for (i = 0;i < EMSFrameCount;i++)\r
                {\r
-                       if (EMSList[i].lastHit < last)\r
+                       if (gvar->pm.emm.EMSList[i].lastHit < last)\r
                        {\r
                                emspage = i;\r
-                               last = EMSList[i].lastHit;\r
+                               last = gvar->pm.emm.EMSList[i].lastHit;\r
                        }\r
                }\r
 \r
-               EMSList[emspage].basegvar->pm.emm.EMSPage = emsbase;\r
-               PML_MapEMS(page / PMEMSSubPage,emspage);\r
+               gvar->pm.emm.EMSList[emspage].baseEMSPage = emsbase;\r
+               PML_MapEMS(page / PMEMSSubPage,emspage, gvar);\r
        }\r
 \r
        if (emspage == -1)\r
-               Quit("PML_Getgvar->pm.emm.EMSAddress: EMS find failed");\r
+               Quit("PML_GetEMSAddress: EMS find failed");\r
 \r
-       EMSList[emspage].lastHit = PMFrameCount;\r
+       gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;\r
        offset = emspage * EMSPageSizeSeg;\r
        offset += emsoff * PMPageSizeSeg;\r
        return((memptr)(gvar->pm.emm.EMSPageFrame + offset));\r
 }\r
 #else\r
 memptr\r
-PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)\r
+PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)\r
 {\r
        word    emspage;\r
 \r
@@ -699,7 +722,7 @@ PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)
 \r
        PML_MapEMS(page / PMEMSSubPage,emspage);\r
 \r
-       return((memptr)(gvar->pm.emm.EMSPageFrame + (emspage * EMSPageSizeSeg)\r
+       return((memptr)(EMSPageFrame + (emspage * EMSPageSizeSeg)\r
                        + ((page & (PMEMSSubPage - 1)) * PMPageSizeSeg)));\r
 }\r
 #endif\r
@@ -711,15 +734,15 @@ PML_Getgvar->pm.emm.EMSAddress(int page,PMLockType lock)
 //\r
 //\r
 memptr\r
-PM_GetPageAddress(int pagenum)\r
+PM_GetPageAddress(int pagenum, global_game_variables_t *gvar)\r
 {\r
        PageListStruct  far *page;\r
 \r
-       page = &PMPages[pagenum];\r
+       page = &gvar->pm.PMPages[pagenum];\r
        if (page->mainPage != -1)\r
-               return(MainMemPages[page->mainPage]);\r
+               return(gvar->pm.mm.MainMemPages[page->mainPage]);\r
        else if (page->emsPage != -1)\r
-               return(PML_Getgvar->pm.emm.EMSAddress(page->emsPage,page->locked));\r
+               return(PML_GetEMSAddress(page->emsPage,page->locked, gvar));\r
        else\r
                return(nil);\r
 }\r
@@ -729,13 +752,13 @@ PM_GetPageAddress(int pagenum)
 //             present & unlocked main/EMS page (or main page if mainonly is true)\r
 //\r
 int\r
-PML_GiveLRUPage(boolean mainonly)\r
+PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)\r
 {\r
        int                             i,lru;\r
        long                    last;\r
        PageListStruct  far *page;\r
 \r
-       for (i = 0,page = PMPages,lru = -1,last = MAXLONG;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages,lru = -1,last = LONG_MAX;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
        {\r
                if\r
                (\r
@@ -756,18 +779,18 @@ PML_GiveLRUPage(boolean mainonly)
 }\r
 \r
 //\r
-//     PML_GiveLRUgvar->pm.xmm.XMSPage() - Returns the page # of the least recently used\r
+//     PML_GiveLRUXMSPage() - Returns the page # of the least recently used\r
 //             (and present) XMS page.\r
 //     This routine won't return the XMS page protected (by gvar->pm.xmm.XMSProtectPage)\r
 //\r
 int\r
-PML_GiveLRUgvar->pm.xmm.XMSPage(void)\r
+PML_GiveLRUXMSPage(global_game_variables_t *gvar)\r
 {\r
        int                             i,lru;\r
        long                    last;\r
        PageListStruct  far *page;\r
 \r
-       for (i = 0,page = PMPages,lru = -1,last = MAXLONG;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages,lru = -1,last = LONG_MAX;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
        {\r
                if\r
                (\r
@@ -788,7 +811,7 @@ PML_GiveLRUgvar->pm.xmm.XMSPage(void)
 //             it with the main/EMS page\r
 //\r
 void\r
-PML_PutPageInXMS(int pagenum)\r
+PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)\r
 {\r
        int                             usexms;\r
        PageListStruct  far *page;\r
@@ -796,21 +819,21 @@ PML_PutPageInXMS(int pagenum)
        if (!gvar->pm.xmm.XMSPresent)\r
                return;\r
 \r
-       page = &PMPages[pagenum];\r
+       page = &gvar->pm.PMPages[pagenum];\r
        if (page->xmsPage != -1)\r
                return;                                 // Already in XMS\r
 \r
-       if (gvar->pm.xmm.XMSPagesUsed < gvar->pm.xmm.XMSPagesAvail)\r
-               page->xmsPage = gvar->pm.xmm.XMSPagesUsed++;\r
+       if (gvar->pm.XMSPagesUsed < gvar->pm.xmm.XMSPagesAvail)\r
+               page->xmsPage = gvar->pm.XMSPagesUsed++;\r
        else\r
        {\r
-               usexms = PML_GiveLRUgvar->pm.xmm.XMSPage();\r
+               usexms = PML_GiveLRUXMSPage(gvar);\r
                if (usexms == -1)\r
                        Quit("PML_PutPageInXMS: No XMS LRU");\r
-               page->xmsPage = PMPages[usexms].xmsPage;\r
-               PMPages[usexms].xmsPage = -1;\r
+               page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;\r
+               gvar->pm.PMPages[usexms].xmsPage = -1;\r
        }\r
-       PML_CopyToXMS(PM_GetPageAddress(pagenum),page->xmsPage,page->length);\r
+       PML_CopyToXMS(PM_GetPageAddress(pagenum, gvar),page->xmsPage,page->length, gvar);\r
 }\r
 \r
 //\r
@@ -818,7 +841,7 @@ PML_PutPageInXMS(int pagenum)
 //             the old one's address space. Returns the address of the new page.\r
 //\r
 memptr\r
-PML_TransferPageSpace(int orig,int new)\r
+PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)\r
 {\r
        memptr                  addr;\r
        PageListStruct  far *origpage,far *newpage;\r
@@ -826,8 +849,8 @@ PML_TransferPageSpace(int orig,int new)
        if (orig == new)\r
                Quit("PML_TransferPageSpace: Identity replacement");\r
 \r
-       origpage = &PMPages[orig];\r
-       newpage = &PMPages[new];\r
+       origpage = &gvar->pm.PMPages[orig];\r
+       newpage = &gvar->pm.PMPages[new];\r
 \r
        if (origpage->locked != pml_Unlocked)\r
                Quit("PML_TransferPageSpace: Killing locked page");\r
@@ -836,10 +859,10 @@ PML_TransferPageSpace(int orig,int new)
                Quit("PML_TransferPageSpace: Reusing non-existent page");\r
 \r
        // Copy page that's about to be purged into XMS\r
-       PML_PutPageInXMS(orig);\r
+       PML_PutPageInXMS(orig, gvar);\r
 \r
        // Get the address, and force EMS into a physical page if necessary\r
-       addr = PM_GetPageAddress(orig);\r
+       addr = PM_GetPageAddress(orig, gvar);\r
 \r
        // Steal the address\r
        newpage->emsPage = origpage->emsPage;\r
@@ -863,24 +886,24 @@ PML_TransferPageSpace(int orig,int new)
 //             will be looked at by PML_GiveLRUPage().\r
 //\r
 byte far *\r
-PML_GetAPageBuffer(int pagenum,boolean mainonly)\r
+PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)\r
 {\r
        byte                    far *addr = nil;\r
        int                             i,n;\r
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       page = &PMPages[pagenum];\r
-       if ((gvar->pm.emm.EMSPagesUsed < gvar->pm.emm.EMSPagesAvail) && !mainonly)\r
+       page = &gvar->pm.PMPages[pagenum];\r
+       if ((gvar->pm.EMSPagesUsed < gvar->pm.emm.EMSPagesAvail) && !mainonly)\r
        {\r
                // There's remaining EMS - use it\r
-               page->emsPage = gvar->pm.emm.EMSPagesUsed++;\r
-               addr = PML_Getgvar->pm.emm.EMSAddress(page->emsPage,page->locked);\r
+               page->emsPage = gvar->pm.EMSPagesUsed++;\r
+               addr = PML_GetEMSAddress(page->emsPage,page->locked, gvar);\r
        }\r
-       else if (MainPagesUsed < MainPagesAvail)\r
+       else if (gvar->pm.MainPagesUsed < gvar->pm.mm.MainPagesAvail)\r
        {\r
                // There's remaining main memory - use it\r
-               for (i = 0,n = -1,used = MainMemUsed;i < PMMaxMainMem;i++,used++)\r
+               for (i = 0,n = -1,used = gvar->pm.mm.MainMemUsed;i < PMMaxMainMem;i++,used++)\r
                {\r
                        if ((*used & pmba_Allocated) && !(*used & pmba_Used))\r
                        {\r
@@ -891,14 +914,14 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly)
                }\r
                if (n == -1)\r
                        Quit("PML_GetPageBuffer: MainPagesAvail lied");\r
-               addr = MainMemPages[n];\r
+               addr = gvar->pm.mm.MainMemPages[n];\r
                if (!addr)\r
                        Quit("PML_GetPageBuffer: Purged main block");\r
                page->mainPage = n;\r
-               MainPagesUsed++;\r
+               gvar->pm.MainPagesUsed++;\r
        }\r
        else\r
-               addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly),pagenum);\r
+               addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);\r
 \r
        if (!addr)\r
                Quit("PML_GetPageBuffer: Search failed");\r
@@ -909,27 +932,27 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly)
 //     PML_GetPageFromXMS() - If page is in XMS, find LRU main/EMS page and\r
 //             replace it with the page from XMS. If mainonly is true, will only\r
 //             search for LRU main page.\r
-//     gvar->pm.xmm.XMSProtectPage is set to the page to be retrieved from XMS, so that if\r
+//     XMSProtectPage is set to the page to be retrieved from XMS, so that if\r
 //             the page from which we're stealing the main/EMS from isn't in XMS,\r
 //             it won't copy over the page that we're trying to get from XMS.\r
 //             (pages that are being purged are copied into XMS, if possible)\r
 //\r
 memptr\r
-PML_GetPageFromXMS(int pagenum,boolean mainonly)\r
+PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)\r
 {\r
        byte                    far *checkaddr;\r
        memptr                  addr = nil;\r
        PageListStruct  far *page;\r
 \r
-       page = &PMPages[pagenum];\r
+       page = &gvar->pm.PMPages[pagenum];\r
        if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1))\r
        {\r
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
-               checkaddr = PML_GetAPageBuffer(pagenum,mainonly);\r
+               checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
                if (FP_OFF(checkaddr))\r
                        Quit("PML_GetPageFromXMS: Non segment pointer");\r
                addr = (memptr)FP_SEG(checkaddr);\r
-               PML_CopyFromXMS(addr,page->xmsPage,page->length);\r
+               PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);\r
                gvar->pm.xmm.XMSProtectPage = -1;\r
        }\r
 \r
@@ -942,14 +965,14 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly)
 //             only be loaded into main.\r
 //\r
 void\r
-PML_LoadPage(int pagenum,boolean mainonly)\r
+PML_LoadPage(int pagenum,boolean mainonly, global_game_variables_t *gvar)\r
 {\r
        byte                    far *addr;\r
        PageListStruct  far *page;\r
 \r
-       addr = PML_GetAPageBuffer(pagenum,mainonly);\r
-       page = &PMPages[pagenum];\r
-       PML_ReadFromFile(addr,page->offset,page->length);\r
+       addr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
+       page = &gvar->pm.PMPages[pagenum];\r
+       PML_ReadFromFile(addr,page->offset,page->length, gvar);\r
 }\r
 \r
 //\r
@@ -960,14 +983,14 @@ PML_LoadPage(int pagenum,boolean mainonly)
 //\r
 #pragma warn -pia\r
 memptr\r
-PM_GetPage(int pagenum)\r
+PM_GetPage(int pagenum, global_game_variables_t *gvar)\r
 {\r
        memptr  result;\r
 \r
        if (pagenum >= gvar->pm.fi.ChunksInFile)\r
                Quit("PM_GetPage: Invalid page request");\r
 \r
-#if __DEBUG__  // for debugging\r
+#ifdef __DEBUG_2__     // for debugging\r
        __asm {\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -979,23 +1002,23 @@ PM_GetPage(int pagenum)
        }\r
 #endif\r
 \r
-       if (!(result = PM_GetPageAddress(pagenum)))\r
+       if (!(result = PM_GetPageAddress(pagenum, gvar)))\r
        {\r
-               boolean mainonly = (pagenum >= PMSoundStart);\r
-if (!PMPages[pagenum].offset)  // JDC: sparse page\r
+               boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart);\r
+if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page\r
        Quit ("Tried to load a sparse page!");\r
-               if (!(result = PML_GetPageFromXMS(pagenum,mainonly)))\r
+               if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar)))\r
                {\r
-                       if (PMPages[pagenum].lastHit == PMFrameCount)\r
-                               PMThrashing++;\r
+                       if (gvar->pm.PMPages[pagenum].lastHit ==  gvar->pm.PMFrameCount)\r
+                               gvar->pm.PMThrashing++;\r
 \r
-                       PML_LoadPage(pagenum,mainonly);\r
-                       result = PM_GetPageAddress(pagenum);\r
+                       PML_LoadPage(pagenum,mainonly, gvar);\r
+                       result = PM_GetPageAddress(pagenum, gvar);\r
                }\r
        }\r
-       PMPages[pagenum].lastHit = PMFrameCount;\r
+       gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;\r
 \r
-#if __DEBUG__  // for debugging\r
+#ifdef __DEBUG_2__     // for debugging\r
        __asm{\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1020,12 +1043,12 @@ if (!PMPages[pagenum].offset)   // JDC: sparse page
 //                                     specified when returning the address. For sound stuff.\r
 //\r
 void\r
-PM_SetPageLock(int pagenum,PMLockType lock)\r
+PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)\r
 {\r
-       if (pagenum < PMSoundStart)\r
+       if (pagenum < gvar->pm.fi.PMSoundStart)\r
                Quit("PM_SetPageLock: Locking/unlocking non-sound page");\r
 \r
-       PMPages[pagenum].locked = lock;\r
+       gvar->pm.PMPages[pagenum].locked = lock;\r
 }\r
 \r
 //\r
@@ -1034,7 +1057,7 @@ PM_SetPageLock(int pagenum,PMLockType lock)
 //             page, and the total pages that need to be loaded (for thermometer).\r
 //\r
 void\r
-PM_Preload(boolean (*update)(word current,word total))\r
+PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar)\r
 {\r
        int                             i,j,\r
                                        page,oogypage;\r
@@ -1046,17 +1069,17 @@ PM_Preload(boolean (*update)(word current,word total))
        memptr                  addr;\r
        PageListStruct  far *p;\r
 \r
-       mainfree = (MainPagesAvail - MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.emm.EMSPagesUsed);\r
-       xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.xmm.XMSPagesUsed);\r
+       mainfree = (gvar->pm.mm.MainPagesAvail - gvar->pm.MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.EMSPagesUsed);\r
+       xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.XMSPagesUsed);\r
 \r
        xmstotal = maintotal = 0;\r
 \r
        for (i = 0;i < gvar->pm.fi.ChunksInFile;i++)\r
        {\r
-               if (!PMPages[i].offset)\r
+               if (!gvar->pm.PMPages[i].offset)\r
                        continue;                       // sparse\r
 \r
-               if ( PMPages[i].emsPage != -1 || PMPages[i].mainPage != -1 )\r
+               if ( gvar->pm.PMPages[i].emsPage != -1 || gvar->pm.PMPages[i].mainPage != -1 )\r
                        continue;                       // already in main mem\r
 \r
                if ( mainfree )\r
@@ -1064,7 +1087,7 @@ PM_Preload(boolean (*update)(word current,word total))
                        maintotal++;\r
                        mainfree--;\r
                }\r
-               else if ( xmsfree && (PMPages[i].xmsPage == -1) )\r
+               else if ( xmsfree && (gvar->pm.PMPages[i].xmsPage == -1) )\r
                {\r
                        xmstotal++;\r
                        xmsfree--;\r
@@ -1085,14 +1108,14 @@ PM_Preload(boolean (*update)(word current,word total))
 //\r
        while (maintotal)\r
        {\r
-               while ( !PMPages[page].offset || PMPages[page].mainPage != -1\r
-                       ||      PMPages[page].emsPage != -1 )\r
+               while ( !gvar->pm.PMPages[page].offset || gvar->pm.PMPages[page].mainPage != -1\r
+                       ||      gvar->pm.PMPages[page].emsPage != -1 )\r
                        page++;\r
 \r
                if (page >= gvar->pm.fi.ChunksInFile)\r
                        Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
 \r
-               PM_GetPage(page);\r
+               PM_GetPage(page, gvar);\r
 \r
                page++;\r
                current++;\r
@@ -1105,30 +1128,30 @@ PM_Preload(boolean (*update)(word current,word total))
 //\r
        if (xmstotal)\r
        {\r
-               for (oogypage = 0 ; PMPages[oogypage].mainPage == -1 ; oogypage++)\r
+               for (oogypage = 0 ; gvar->pm.PMPages[oogypage].mainPage == -1 ; oogypage++)\r
                ;\r
-               addr = PM_GetPage(oogypage);\r
+               addr = PM_GetPage(oogypage, gvar);\r
                if (!addr)\r
                        Quit("PM_Preload: XMS buffer failed");\r
 \r
                while (xmstotal)\r
                {\r
-                       while ( !PMPages[page].offset || PMPages[page].xmsPage != -1 )\r
+                       while ( !gvar->pm.PMPages[page].offset || gvar->pm.PMPages[page].xmsPage != -1 )\r
                                page++;\r
 \r
                        if (page >= gvar->pm.fi.ChunksInFile)\r
                                Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
 \r
-                       p = &PMPages[page];\r
+                       p = &gvar->pm.PMPages[page];\r
 \r
-                       p->xmsPage = gvar->pm.xmm.XMSPagesUsed++;\r
-                       if (gvar->pm.xmm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)\r
+                       p->xmsPage = gvar->pm.XMSPagesUsed++;\r
+                       if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)\r
                                Quit("PM_Preload: Exceeded XMS pages");\r
                        if (p->length > PMPageSize)\r
                                Quit("PM_Preload: Page too long");\r
 \r
-                       PML_ReadFromFile((byte far *)addr,p->offset,p->length);\r
-                       PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length);\r
+                       PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);\r
+                       PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);\r
 \r
                        page++;\r
                        current++;\r
@@ -1136,8 +1159,8 @@ PM_Preload(boolean (*update)(word current,word total))
                        update(current,total);\r
                }\r
 \r
-               p = &PMPages[oogypage];\r
-               PML_ReadFromFile((byte far *)addr,p->offset,p->length);\r
+               p = &gvar->pm.PMPages[oogypage];\r
+               PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);\r
        }\r
 \r
        update(total,total);\r
@@ -1159,48 +1182,48 @@ PM_Preload(boolean (*update)(word current,word total))
 //\r
 //\r
 void\r
-PM_NextFrame(void)\r
+PM_NextFrame(global_game_variables_t *gvar)\r
 {\r
        int     i;\r
 \r
        // Frame count overrun - kill the LRU hit entries & reset frame count\r
-       if (++PMFrameCount >= MAXLONG - 4)\r
+       if (++gvar->pm.PMFrameCount >= LONG_MAX - 4)\r
        {\r
-               for (i = 0;i < PMNumBlocks;i++)\r
-                       PMPages[i].lastHit = 0;\r
-               PMFrameCount = 0;\r
+               for (i = 0;i < gvar->pm.PMNumBlocks;i++)\r
+                       gvar->pm.PMPages[i].lastHit = 0;\r
+               gvar->pm.PMFrameCount = 0;\r
        }\r
 \r
-#if 0\r
-       for (i = 0;i < PMSoundStart;i++)\r
+//#if 0\r
+       for (i = 0;i < gvar->pm.fi.PMSoundStart;i++)\r
        {\r
-               if (PMPages[i].locked)\r
+               if (gvar->pm.PMPages[i].locked)\r
                {\r
                        char buf[40];\r
                        sprintf(buf,"PM_NextFrame: Page %d is locked",i);\r
                        Quit(buf);\r
                }\r
        }\r
-#endif\r
+//#endif\r
 \r
-       if (PMPanicMode)\r
+       if (gvar->pm.PMPanicMode)\r
        {\r
                // DEBUG - set border color\r
-               if ((!PMThrashing) && (!--PMPanicMode))\r
+               if ((!gvar->pm.PMThrashing) && (!--gvar->pm.PMPanicMode))\r
                {\r
                        // DEBUG - reset border color\r
                }\r
        }\r
-       if (PMThrashing >= PMThrashThreshold)\r
-               PMPanicMode = PMUnThrashThreshold;\r
-       PMThrashing = false;\r
+       if (gvar->pm.PMThrashing >= PMThrashThreshold)\r
+               gvar->pm.PMPanicMode = PMUnThrashThreshold;\r
+       gvar->pm.PMThrashing = false;\r
 }\r
 \r
 //\r
 //     PM_Reset() - Sets up caching structures\r
 //\r
 void\r
-PM_Reset(void)\r
+PM_Reset(global_game_variables_t *gvar)\r
 {\r
        int                             i;\r
        PageListStruct  far *page;\r
@@ -1210,12 +1233,12 @@ PM_Reset(void)
        gvar->pm.emm.EMSPagesAvail = gvar->pm.emm.EMSAvail * (EMSPageSizeKB / PMPageSizeKB);\r
        gvar->pm.emm.EMSPhysicalPage = 0;\r
 \r
-       MainPagesUsed = gvar->pm.emm.EMSPagesUsed = gvar->pm.xmm.XMSPagesUsed = 0;\r
+       gvar->pm.MainPagesUsed = gvar->pm.EMSPagesUsed = gvar->pm.XMSPagesUsed = 0;\r
 \r
-       PMPanicMode = false;\r
+       gvar->pm.PMPanicMode = false;\r
 \r
        // Initialize page list\r
-       for (i = 0,page = PMPages;i < PMNumBlocks;i++,page++)\r
+       for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.PMNumBlocks;i++,page++)\r
        {\r
                page->mainPage = -1;\r
                page->emsPage = -1;\r
@@ -1228,18 +1251,36 @@ PM_Reset(void)
 //     PM_Startup() - Start up the Page Mgr\r
 //\r
 void\r
-PM_Startup(void)\r
+PM_Startup(global_game_variables_t *gvar)\r
 {\r
        boolean nomain,noems,noxms;\r
        int             i;\r
 \r
-       if (PMStarted)\r
+       if (gvar->pm.PMStarted)\r
                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 < _argc;i++)\r
+       for (i = 1;i <\r
+#ifdef __WATCOMC__\r
+       __argc\r
+#endif\r
+#ifdef __BORLANDC__\r
+       _argc\r
+#endif\r
+       ;i++)\r
        {\r
-               switch (US_CheckParm(_argv[i],ParmStrings))\r
+               switch (US_CheckParm(\r
+#ifdef __WATCOMC__\r
+       __argv[i]\r
+#endif\r
+#ifdef __BORLANDC__\r
+       _argv[i]\r
+#endif\r
+               ,ParmStrings))\r
                {\r
                case 0:\r
                        nomain = true;\r
@@ -1253,12 +1294,12 @@ PM_Startup(void)
                }\r
        }\r
 \r
-       PML_OpenPageFile();\r
+       PML_OpenPageFile(gvar);\r
 \r
        if (!noems)\r
-               PML_StartupEMS();\r
+               PML_StartupEMS(gvar);\r
        if (!noxms)\r
-               PML_StartupXMS();\r
+               PML_StartupXMS(gvar);\r
 \r
        if (nomain && !gvar->pm.emm.EMSPresent)\r
        {\r
@@ -1266,26 +1307,26 @@ PM_Startup(void)
                //return;\r
        }\r
        else\r
-               PML_StartupMainMem();\r
+               PML_StartupMainMem(gvar);\r
 \r
-       PM_Reset();\r
+       PM_Reset(gvar);\r
 \r
-       PMStarted = true;\r
+       gvar->pm.PMStarted = true;\r
 }\r
 \r
 //\r
 //     PM_Shutdown() - Shut down the Page Mgr\r
 //\r
 void\r
-PM_Shutdown(void)\r
+PM_Shutdown(global_game_variables_t *gvar)\r
 {\r
-       PML_ShutdownXMS();\r
-       PML_ShutdownEMS();\r
+       PML_ShutdownXMS(gvar);\r
+       PML_ShutdownEMS(gvar);\r
 \r
-       if (!PMStarted)\r
+       if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       PML_ClosePageFile();\r
+       PML_ClosePageFile(gvar);\r
 \r
-       PML_ShutdownMainMem();\r
+       PML_ShutdownMainMem(gvar);\r
 }\r