xcrollbroke

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 858bd4b9fe121208edf5393ae64f714c4596978a..55a7d3710e96933296e417961cfa348c72b30aac 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -139,7 +139,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
                strcpy(str,"MM_MapEMS: EMS error ");\r
                MM_EMSerr(str, err);\r
                printf("%s\n",str);\r
-               Quit (gvar, "PML_MapEMS: Page mapping failed\n");\r
+               Quit ("PML_MapEMS: Page mapping failed\n");\r
                return err;\r
        }\r
        return 0;\r
@@ -326,7 +326,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
                        strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");\r
                        MM_EMSerr(str, err);\r
                        printf("%s\n",str);\r
-                       Quit (gvar, "PML_ShutdownEMS: Error freeing EMS\n");\r
+                       Quit ("PML_ShutdownEMS: Error freeing EMS\n");\r
                        //return;\r
                }\r
        }\r
@@ -506,7 +506,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 \r
        if (!addr)\r
        {\r
-               Quit (gvar, "PML_XMSCopy: zero address\n");\r
+               Quit ("PML_XMSCopy: zero address\n");\r
        }\r
 \r
        xoffset = (dword)xmspage * PMPageSize;\r
@@ -527,7 +527,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
        }\r
        if (!_AX)\r
        {\r
-               Quit (gvar, "PML_XMSCopy: Error on copy");\r
+               Quit ("PML_XMSCopy: Error on copy");\r
                //return;\r
        }\r
 }\r
@@ -594,7 +594,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 #endif\r
                if(errorflag==true)\r
                {\r
-                       Quit (gvar, "PML_ShutdownXMS: Error freeing XMS");\r
+                       Quit ("PML_ShutdownXMS: Error freeing XMS");\r
                        //return;\r
                }\r
        }\r
@@ -631,7 +631,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 \r
        else\r
        {\r
-               Quit (gvar, "MainPresent IS NULL\n");\r
+               Quit ("MainPresent IS NULL\n");\r
        }\r
 }\r
 \r
@@ -740,7 +740,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                gvar->mm.mmerror = false;\r
        if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)\r
        {\r
-               Quit (gvar, "PM_SetupMainMem: Not enough main memory");\r
+               Quit ("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
        gvar->pm.mm.MainPresent = true;\r
@@ -776,22 +776,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t
 {\r
        if (!buf)\r
        {\r
-               Quit (gvar, "PML_ReadFromFile: Null pointer");\r
+               Quit ("PML_ReadFromFile: Null pointer");\r
                //return;\r
        }\r
        if (!offset)\r
        {\r
-               Quit (gvar, "PML_ReadFromFile: Zero offset");\r
+               Quit ("PML_ReadFromFile: Zero offset");\r
                //return;\r
        }\r
        if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)\r
        {\r
-               Quit (gvar, "PML_ReadFromFile: Seek failed");\r
+               Quit ("PML_ReadFromFile: Seek failed");\r
                //return;\r
        }\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))\r
        {\r
-               Quit (gvar, "PML_ReadFromFile: Read failed");\r
+               Quit ("PML_ReadFromFile: Read failed");\r
                //return;\r
        }\r
 }\r
@@ -812,7 +812,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);\r
        if (gvar->pm.fi.PageFile == -1)\r
        {\r
-               Quit (gvar, "PML_OpenPageFile: Unable to open page file");\r
+               Quit ("PML_OpenPageFile: Unable to open page file");\r
                //return;\r
        }\r
 \r
@@ -833,7 +833,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        MM_GetPtr((memptr *)&buf, size, gvar);\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
-               Quit (gvar, "PML_OpenPageFile: Offset read failed");\r
+               Quit ("PML_OpenPageFile: Offset read failed");\r
                //return;\r
        }\r
        offsetptr = (dword far *)buf;\r
@@ -846,7 +846,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        MM_GetPtr(&buf,size, gvar);\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
-               Quit (gvar, "PML_OpenPageFile: Length read failed");\r
+               Quit ("PML_OpenPageFile: Length read failed");\r
                //return;\r
        }\r
        lengthptr = (word far *)buf;\r
@@ -923,7 +923,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)
        }\r
 \r
        if (emspage == -1)\r
-               Quit (gvar, "PML_GetEMSAddress: EMS find failed");\r
+               Quit ("PML_GetEMSAddress: EMS find failed");\r
 \r
        gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;\r
        offset = emspage * EMSPageSizeSeg;\r
@@ -992,7 +992,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
        }\r
 \r
        if (lru == -1)\r
-               Quit (gvar, "PML_GiveLRUPage: LRU Search failed");\r
+               Quit ("PML_GiveLRUPage: LRU Search failed");\r
        return(lru);\r
 }\r
 \r
@@ -1047,7 +1047,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        {\r
                usexms = PML_GiveLRUXMSPage(gvar);\r
                if (usexms == -1)\r
-                       Quit (gvar, "PML_PutPageInXMS: No XMS LRU");\r
+                       Quit ("PML_PutPageInXMS: No XMS LRU");\r
                page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;\r
                gvar->pm.PMPages[usexms].xmsPage = -1;\r
        }\r
@@ -1065,16 +1065,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
        PageListStruct  far *origpage,far *newpage;\r
 \r
        if (orig == new)\r
-               Quit (gvar, "PML_TransferPageSpace: Identity replacement");\r
+               Quit ("PML_TransferPageSpace: Identity replacement");\r
 \r
        origpage = &gvar->pm.PMPages[orig];\r
        newpage = &gvar->pm.PMPages[new];\r
 \r
        if (origpage->locked != pml_Unlocked)\r
-               Quit (gvar, "PML_TransferPageSpace: Killing locked page");\r
+               Quit ("PML_TransferPageSpace: Killing locked page");\r
 \r
        if ((origpage->emsPage == -1) && (origpage->mainPage == -1))\r
-               Quit (gvar, "PML_TransferPageSpace: Reusing non-existent page");\r
+               Quit ("PML_TransferPageSpace: Reusing non-existent page");\r
 \r
        // Copy page that's about to be purged into XMS\r
        PML_PutPageInXMS(orig, gvar);\r
@@ -1090,7 +1090,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
        origpage->mainPage = origpage->emsPage = -1;\r
 \r
        if (!addr)\r
-               Quit (gvar, "PML_TransferPageSpace: Zero replacement");\r
+               Quit ("PML_TransferPageSpace: Zero replacement");\r
 \r
        return(addr);\r
 }\r
@@ -1131,10 +1131,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                        }\r
                }\r
                if (n == -1)\r
-                       Quit (gvar, "PML_GetPageBuffer: MainPagesAvail lied");\r
+                       Quit ("PML_GetPageBuffer: MainPagesAvail lied");\r
                addr = gvar->pm.mm.MainMemPages[n];\r
                if (!addr)\r
-                       Quit (gvar, "PML_GetPageBuffer: Purged main block");\r
+                       Quit ("PML_GetPageBuffer: Purged main block");\r
                page->mainPage = n;\r
                gvar->pm.MainPagesUsed++;\r
        }\r
@@ -1142,7 +1142,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);\r
 \r
        if (!addr)\r
-               Quit (gvar, "PML_GetPageBuffer: Search failed");\r
+               Quit ("PML_GetPageBuffer: Search failed");\r
        return(addr);\r
 }\r
 \r
@@ -1168,7 +1168,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
                if (FP_OFF(checkaddr))\r
-                       Quit (gvar, "PML_GetPageFromXMS: Non segment pointer");\r
+                       Quit ("PML_GetPageFromXMS: Non segment pointer");\r
                addr = (memptr)FP_SEG(checkaddr);\r
                PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);\r
                gvar->pm.xmm.XMSProtectPage = -1;\r
@@ -1206,7 +1206,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
        memptr  result;\r
 \r
        if (pagenum >= gvar->pm.fi.ChunksInFile)\r
-               Quit (gvar, "PM_GetPage: Invalid page request");\r
+               Quit ("PM_GetPage: Invalid page request");\r
 \r
 //#ifdef __DEBUG_2__   // for debugging\r
        __asm {\r
@@ -1224,7 +1224,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
        {\r
                boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart);\r
 if (!gvar->pm.PMPages[pagenum].offset) // JDC: sparse page\r
-       Quit (gvar, "Tried to load a sparse page!");\r
+       Quit ("Tried to load a sparse page!");\r
                if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar)))\r
                {\r
                        if (gvar->pm.PMPages[pagenum].lastHit ==  gvar->pm.PMFrameCount)\r
@@ -1265,7 +1265,7 @@ void
 PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)\r
 {\r
        if (pagenum < gvar->pm.fi.PMSoundStart)\r
-               Quit (gvar, "PM_SetPageLock: Locking/unlocking non-sound page");\r
+               Quit ("PM_SetPageLock: Locking/unlocking non-sound page");\r
 \r
        gvar->pm.PMPages[pagenum].locked = lock;\r
 }\r
@@ -1332,7 +1332,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
                        page++;\r
 \r
                if (page >= gvar->pm.fi.ChunksInFile)\r
-                       Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
+                       Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
 \r
                PM_GetPage(page, gvar);\r
 \r
@@ -1351,7 +1351,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
                ;\r
                addr = PM_GetPage(oogypage, gvar);\r
                if (!addr)\r
-                       Quit (gvar, "PM_Preload: XMS buffer failed");\r
+                       Quit ("PM_Preload: XMS buffer failed");\r
 \r
                while (xmstotal)\r
                {\r
@@ -1359,15 +1359,15 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
                                page++;\r
 \r
                        if (page >= gvar->pm.fi.ChunksInFile)\r
-                               Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
+                               Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");\r
 \r
                        p = &gvar->pm.PMPages[page];\r
 \r
                        p->xmsPage = gvar->pm.XMSPagesUsed++;\r
                        if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)\r
-                               Quit (gvar, "PM_Preload: Exceeded XMS pages");\r
+                               Quit ("PM_Preload: Exceeded XMS pages");\r
                        if (p->length > PMPageSize)\r
-                               Quit (gvar, "PM_Preload: Page too long");\r
+                               Quit ("PM_Preload: Page too long");\r
 \r
                        PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);\r
                        PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);\r
@@ -1420,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 (buf);\r
                }\r
        }\r
 //#endif\r
@@ -1511,7 +1511,7 @@ PM_Startup(global_game_variables_t *gvar)
 \r
        if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)\r
        {\r
-               Quit (gvar, "PM_Startup: No main or EMS\n");\r
+               Quit ("PM_Startup: No main or EMS\n");\r
                //return;\r
        }\r
 \r