wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack...

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 0d1e2bf9a60694f9c2c145f3eb960d3a918c0194..7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -70,6 +70,26 @@ boolean dbg_debugpm=0;
        PageListStruct  far *gvar->pm.PMPages,\r
                                        _seg *gvar->pm.PMSegPages;*/\r
 \r
+static union REGS CPURegs;\r
+\r
+#define _AX CPURegs.x.ax\r
+#define _BX CPURegs.x.bx\r
+#define _CX CPURegs.x.cx\r
+#define _DX CPURegs.x.dx\r
+\r
+#define _SI CPURegs.x.si\r
+\r
+#define _AH CPURegs.h.ah\r
+#define _AL CPURegs.h.al\r
+#define _BH CPURegs.h.bh\r
+#define _BL CPURegs.h.bl\r
+#define _CH CPURegs.h.ch\r
+#define _CL CPURegs.h.cl\r
+#define _DH CPURegs.h.dh\r
+#define _DL CPURegs.h.dl\r
+\r
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);\r
+\r
 static char            *ParmStrings[] = {"nomain","noems","noxms",nil};\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -84,9 +104,9 @@ static       char            *ParmStrings[] = {"nomain","noems","noxms",nil};
 byte\r
 PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)\r
 {\r
-       byte    err, str[160];\r
+       byte    err=0, str[160];\r
        unsigned        EMShandle;\r
-       int     i;\r
+       //int   i;\r
 \r
        boolean errorflag=false;\r
        EMShandle=gvar->pm.emm.EMSHandle;\r
@@ -141,12 +161,12 @@ PML_StartupEMS(global_game_variables_t *gvar)
 {\r
        int             i;\r
        //long  size;\r
-       byte    err, str[64];\r
+       byte    err=0, str[64];\r
 \r
        boolean errorflag=false;\r
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669\r
        unsigned int EMSVer = 0;\r
-       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
+       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0;\r
        totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
        gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
@@ -299,7 +319,7 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)\r
 {\r
        word EMSHandle;\r
-       byte err,str[64];\r
+       byte err=0, str[64];\r
 \r
        boolean errorflag=false;\r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
@@ -727,7 +747,7 @@ PM_CheckMainMem(global_game_variables_t *gvar)
 void\r
 PML_StartupMainMem(global_game_variables_t *gvar)\r
 {\r
-       int             i,n;\r
+       int             i;//,n;\r
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
@@ -1285,15 +1305,15 @@ PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)
 void\r
 PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar)\r
 {\r
-       int                             i,j,\r
+       int                             i,//j,\r
                                        page,oogypage;\r
        word                    current,total,\r
-                                       totalnonxms,totalxms,\r
+                                       //totalnonxms,totalxms,\r
                                        mainfree,maintotal,\r
-                                       emsfree,emstotal,\r
+                                       //emstotal,emsfree,\r
                                        xmsfree,xmstotal;\r
        memptr                  addr;\r
-       PageListStruct  far *p;\r
+       PageListStruct  __far *p;\r
 \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
@@ -1491,23 +1511,9 @@ PM_Startup(global_game_variables_t *gvar)
        //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
 \r
        nomain = noems = noxms = false;\r
-       for (i = 1;i <\r
-#ifdef __WATCOMC__\r
-       __argc\r
-#endif\r
-#ifdef __BORLANDC__\r
-       _argc\r
-#endif\r
-       ;i++)\r
+       for (i = 1;i < _argc;i++)\r
        {\r
-               switch (US_CheckParm(\r
-#ifdef __WATCOMC__\r
-       __argv[i]\r
-#endif\r
-#ifdef __BORLANDC__\r
-       _argv[i]\r
-#endif\r
-               ,ParmStrings))\r
+               switch (US_CheckParm(_argv[i],ParmStrings))\r
                {\r
                case 0:\r
                        nomain = true;\r