[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 2983499bde32abf03708b97500403c006d2eec48..9fabd9be60af74cd1001c5c27c695c6d0435ebe6 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -803,8 +803,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 {\r
        int                             i;\r
        long                    size;\r
-                               //__SEGA buf;\r
-       memptr          buf;\r
+       void                    _seg *buf;\r
        dword           far *offsetptr;\r
        word                    far *lengthptr;\r
        PageListStruct  far *page;\r
@@ -823,14 +822,14 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 \r
        // Allocate and clear the page list\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
+       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, gvar);\r
+       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
@@ -839,7 +838,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        offsetptr = (dword far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->offset = *offsetptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 \r
        // Read in the chunk lengths\r
        size = sizeof(word) * gvar->pm.fi.ChunksInFile;\r
@@ -852,7 +851,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        lengthptr = (word far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->length = *lengthptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 }\r
 \r
 //\r
@@ -865,8 +864,8 @@ PML_ClosePageFile(global_game_variables_t *gvar)
                close(gvar->pm.fi.PageFile);\r
        if (gvar->pm.PMSegPages)\r
        {\r
-               MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);\r
-               MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);\r
+               MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);\r
+               MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);\r
        }\r
 }\r
 \r
@@ -1208,7 +1207,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
@@ -1218,7 +1217,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
@@ -1236,7 +1235,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
@@ -1247,7 +1246,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
@@ -1531,7 +1531,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       //PML_ClosePageFile(gvar);\r
+       //0000+=+=PML_ClosePageFile(gvar);\r
 \r
        PML_ShutdownMainMem(gvar);\r
 }\r