16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 4d9ac9d8f7874515369dfa8f2fcbfb75a6ad9533..ce81eb4a4798071259f92d91737361bf955b7321 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -507,7 +507,6 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
        if (!addr)\r
        {\r
                Quit (gvar, "PML_XMSCopy: zero address\n");\r
-               //return;\r
        }\r
 \r
        xoffset = (dword)xmspage * PMPageSize;\r
@@ -621,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\r
+#ifdef __DEBUG_PM_MAIN__\r
                printf("PM_SetMainMemPurge()    info of gvar->pm.mm.MainMemPages[i]\n");\r
                printf("&       %Fp,    %Fp\n", &gvar->pm.mm.MainMemPages[i],   &(gvar->pm.mm.MainMemPages[i]));\r
+#endif\r
 #endif\r
                if (gvar->pm.mm.MainMemPages[i])\r
                        MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
@@ -1207,7 +1208,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
        if (pagenum >= gvar->pm.fi.ChunksInFile)\r
                Quit (gvar, "PM_GetPage: Invalid page request");\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm {\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1217,7 +1218,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
                mov     al,10   // bright green\r
                out     dx,al\r
        }\r
-#endif\r
+//#endif\r
 \r
        if (!(result = PM_GetPageAddress(pagenum, gvar)))\r
        {\r
@@ -1235,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
        }\r
        gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm{\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1246,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
                out     dx,al\r
                mov     al,0x20 // normal\r
                out     dx,al\r
-#endif\r
+       }\r
+//#endif\r
 \r
        return(result);\r
 }\r
@@ -1418,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar)
                {\r
                        char buf[40];\r
                        sprintf(buf,"PM_NextFrame: Page %d is locked",i);\r
-                       Quit(gvar, buf);\r
+                       Quit (gvar, buf);\r
                }\r
        }\r
 //#endif\r