====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke====

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index ef2d6d5ad38fbae46e632c3d35933adc24c65101..848af9c824b4276790bf01d9e9ced475351ca4fa 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -34,19 +34,19 @@ boolean debugpm=0;
 #endif\r
 \r
 //     Main Mem specific variables\r
-       boolean                 MainPresent;\r
+       //boolean                       MainPresent;\r
 /*     memptr                  MainMemPages[PMMaxMainMem];\r
        PMBlockAttr             gvar->pm.mm.MainMemUsed[PMMaxMainMem];\r
        int                             gvar->pm.mm.MainPagesAvail;*/\r
 \r
 //     EMS specific variables\r
-       boolean                 EMSPresent;\r
+       //boolean                       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
        gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];*/\r
 \r
 //     XMS specific variables\r
-       boolean                 XMSPresent;\r
+       //boolean                       XMSPresent;\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
@@ -58,7 +58,7 @@ boolean debugpm=0;
        word                    PMSpriteStart,PMSoundStart;*/\r
 \r
 //     General usage variables\r
-       boolean                 PMStarted;/*,\r
+/*     boolean                 PMStarted,\r
                                        gvar->pm.PMPanicMode,\r
                                        gvar->pm.PMThrashing;\r
        word                    gvar->pm.XMSPagesUsed,\r
@@ -148,7 +148,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
        unsigned int EMSVer = 0;\r
        unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
        totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
-       EMSPresent = false;                     // Assume that we'll fail\r
+       gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
 \r
        __asm {\r
@@ -277,10 +277,10 @@ End2:
                strcpy(str,"PML_StartupEMS: EMS error ");\r
                MM_EMSerr(str, err);\r
                printf("%s\n",str);\r
-               return(EMSPresent);\r
+               return(gvar->pm.emm.EMSPresent);\r
        }\r
 \r
-       EMSPresent = true;                      // We have EMS\r
+       gvar->pm.emm.EMSPresent = true;                 // We have EMS\r
        gvar->pm.emm.EMSPageFrame = EMSPageFrame;\r
        gvar->pm.emm.EMSAvail = EMSAvail;\r
        gvar->pm.emm.EMSVer = EMSVer;\r
@@ -288,7 +288,7 @@ End2:
        gvar->pm.emm.freeEMSpages = freeEMSpages;\r
        gvar->pm.emm.totalEMSpages = totalEMSpages;\r
 \r
-       return(EMSPresent);\r
+       return(gvar->pm.emm.EMSPresent);\r
 }\r
 \r
 //\r
@@ -304,7 +304,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 \r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
 \r
-       if (EMSPresent)\r
+       if (gvar->pm.emm.EMSPresent)\r
        {\r
                __asm {\r
                        mov     ah,EMS_FREEPAGES\r
@@ -355,7 +355,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSPresent = false;                                     // Assume failure\r
+       gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
        gvar->pm.xmm.XMSAvail = 0;\r
 \r
        _AX=0x4300;\r
@@ -392,9 +392,9 @@ PML_StartupXMS(global_game_variables_t *gvar)
 \r
        gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;\r
 \r
-       XMSPresent = true;\r
+       gvar->pm.xmm.XMSPresent = true;\r
 error:\r
-       return(XMSPresent);\r
+       return(gvar->pm.xmm.XMSPresent);\r
 }\r
 \r
 //\r
@@ -474,7 +474,7 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void\r
 PML_ShutdownXMS(global_game_variables_t *gvar)\r
 {\r
-       if (XMSPresent)\r
+       if (gvar->pm.xmm.XMSPresent)\r
        {\r
                _DX = gvar->pm.xmm.XMSHandle;\r
                XMS_CALL(XMS_FREE);\r
@@ -502,7 +502,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
-       if(MainPresent)\r
+       if(gvar->pm.mm.MainPresent)\r
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\r
@@ -541,7 +541,7 @@ PM_CheckMainMem(global_game_variables_t *gvar)
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       if (!MainPresent)\r
+       if (!gvar->pm.mm.MainPresent)\r
                return;\r
 \r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
@@ -608,7 +608,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
-       MainPresent = false;\r
+       gvar->pm.mm.MainPresent = false;\r
        MM_BombOnError(false, gvar);\r
        printf("PML_StartupMainMem()\n");\r
        printf("        p=%04x  MainMemPages=%04x\n", p, gvar->pm.mm.MainMemPages);\r
@@ -630,7 +630,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                Quit("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
-       MainPresent = true;\r
+       gvar->pm.mm.MainPresent = true;\r
 }\r
 \r
 //\r
@@ -922,7 +922,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        int                             usexms;\r
        PageListStruct  far *page;\r
 \r
-       if (!XMSPresent)\r
+       if (!gvar->pm.xmm.XMSPresent)\r
                return;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
@@ -1051,7 +1051,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
        PageListStruct  far *page;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
-       if (XMSPresent && (page->xmsPage != -1))\r
+       if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1))\r
        {\r
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
@@ -1365,10 +1365,10 @@ PM_Startup(global_game_variables_t *gvar)
        boolean nomain,noems,noxms;\r
        int             i;\r
 \r
-       if (PMStarted)\r
+       if (gvar->pm.PMStarted)\r
                return;\r
 \r
-       strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
+       //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
 \r
        nomain = noems = noxms = false;\r
        for (i = 1;i <\r
@@ -1408,7 +1408,7 @@ PM_Startup(global_game_variables_t *gvar)
        if (!noxms)\r
                //++++PML_StartupXMS(gvar);     //TODO: convert\r
 \r
-       if (!nomain && !EMSPresent)\r
+       if (!nomain && !gvar->pm.emm.EMSPresent)\r
        {\r
                Quit("PM_Startup: No main or EMS\n");\r
                //return;\r
@@ -1417,7 +1417,7 @@ PM_Startup(global_game_variables_t *gvar)
 \r
        PM_Reset(gvar);\r
 \r
-       PMStarted = true;\r
+       gvar->pm.PMStarted = true;\r
 }\r
 \r
 //\r
@@ -1429,7 +1429,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        PML_ShutdownXMS(gvar);\r
        PML_ShutdownEMS(gvar);\r
 \r
-       if (!PMStarted)\r
+       if (!gvar->pm.PMStarted)\r
                return;\r
 \r
        PML_ClosePageFile(gvar);\r