no idea why bcexmm.exe is broke w tweaked zcroll.exe a bit also Quit is refined now~

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 282814bdd77566eff9f03cc15cb49f500f3e94cc..98d0c43fa978f3ac5ce926e2f1f94625a102f6c6 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -28,7 +28,7 @@ Primary coder: John Carmack
 
 RELIES ON
 ---------
-Quit (char *error) function
+Quit (global_game_variables_t *gvar, char *error) function
 
 
 WORK TO DO
@@ -72,9 +72,9 @@ void          (* XMSaddr) (void);             // far pointer to XMS driver
 
 =============================================================================
 */
-
+#ifndef __16_PM__
 static char *ParmStringsexmm[] = {"noems","noxms",""};
-
+#endif
 /*
 ======================
 =
@@ -87,7 +87,7 @@ static        char *ParmStringsexmm[] = {"noems","noxms",""};
 
 boolean MML_CheckForEMS(void)
 {
-       boolean emmcfems;
+       boolean emmcfems=0;
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669
        __asm {
                mov     dx,OFFSET emmname       //fix by andrius4669
@@ -285,7 +285,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar)
        }
 #endif
        if(errorflag==true)
-               Quit("MML_ShutdownEMS: Error freeing EMS!\n");  //++++ add something
+               Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n");   //++++ add something
 }
 
 /*
@@ -439,6 +439,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 
 boolean MML_CheckForXMS(void)
 {
+       //numUMBs = 0;
        boolean errorflag=false;
 
        __asm {
@@ -716,7 +717,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 void MML_ClearBlock(global_game_variables_t *gvar)
 {
        //huge mmblocktype huge *scan,huge *last;
-       mmblocktype far *scan,far *last;
+       mmblocktype __far *scan;//,far *last;
 
        scan = gvar->mm.mmhead->next;
 
@@ -755,7 +756,6 @@ void MM_Startup(global_game_variables_t *gvar)
        //huge void huge        *start;
        void far        *start;
        word    segstart;//,endfree;
-       //memptr *peeonself;
 
        if(gvar->mm.mmstarted)
                MM_Shutdown(gvar);
@@ -769,9 +769,7 @@ void MM_Startup(global_game_variables_t *gvar)
        gvar->mm.mmhead = NULL;
        gvar->mm.mmfree = &(gvar->mm.mmblocks[0]);
        for(i=0;i<MAXBLOCKS-1;i++)
-       {
                gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]);
-       }
        gvar->mm.mmblocks[i].next = NULL;
 
 //
@@ -783,11 +781,8 @@ void MM_Startup(global_game_variables_t *gvar)
        gvar->mm.mmnew->length = 0xffff;
        gvar->mm.mmnew->attributes = LOCKBIT;
        gvar->mm.mmnew->next = NULL;
-       //gvar->mm.mmnew->useptr = peeonself;
        gvar->mm.mmrover = gvar->mm.mmhead;
 
-       //printf("              %x\n", peeonself);
-       //printf("              %x\n", *peeonself);
 //
 // get all available near conventional memory segments
 //
@@ -842,23 +837,9 @@ void MM_Startup(global_game_variables_t *gvar)
 //
        gvar->mmi.EMSmem = 0;
 //goto emsskip;        //0000
-       for(i = 1;i <
-#ifdef __WATCOMC__
-       __argc
-#endif
-#ifdef __BORLANDC__
-       _argc
-#endif
-       ;i++)
+       for(i = 1;i < _argc;i++)
        {
-               if(US_CheckParm(
-#ifdef __WATCOMC__
-       __argv[i]
-#endif
-#ifdef __BORLANDC__
-       _argv[i]
-#endif
-                       ,ParmStringsexmm) == 0)
+               if(US_CheckParm(_argv[i],ParmStringsexmm) == 0)
                        goto emsskip;                           // param NOEMS
        }
        if(MML_CheckForEMS())
@@ -878,23 +859,9 @@ void MM_Startup(global_game_variables_t *gvar)
 emsskip:
        gvar->mmi.XMSmem = 0;
 goto xmsskip;//0000
-       for(i = 1;i <
-#ifdef __WATCOMC__
-       __argc
-#endif
-#ifdef __BORLANDC__
-       _argc
-#endif
-       ;i++)
+       for(i = 1;i < _argc;i++)
        {
-               if(US_CheckParm(
-#ifdef __WATCOMC__
-       __argv[i]
-#endif
-#ifdef __BORLANDC__
-       _argv[i]
-#endif
-                       ,ParmStringsexmm) == 0)
+               if(US_CheckParm( _argv[i],ParmStringsexmm) == 0)
                        goto xmsskip;                           // param NOXMS
        }
        if(MML_CheckForXMS())
@@ -903,11 +870,11 @@ goto xmsskip;//0000
        }
 
        }
+xmsskip:
 #endif
 //
 // allocate the misc buffer
 //
-xmsskip:
        gvar->mm.mmrover = gvar->mm.mmhead;             // start looking for space after low block
 
        MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar);
@@ -937,6 +904,7 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __BORLANDC__
        free(gvar->mm.nearheap);//      printf("                near freed\n");
 #endif
+#ifndef __16_PM__
 #ifdef __DEBUG__
        if(!dbg_debugpm) {
 #endif
@@ -945,6 +913,7 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __DEBUG__
        }
 #endif
+#endif
 }
 
 //==========================================================================
@@ -1136,7 +1105,7 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
                        gvar->mm.mmrover = gvar->mm.mmhead;
                else if(gvar->mm.mmrover == start)
                {
-                       Quit("MM_SetPurge: Block not found!");
+                       Quit (gvar, "MM_SetPurge: Block not found!");
                        //return;
                }
 
@@ -1176,7 +1145,7 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
                        gvar->mm.mmrover = gvar->mm.mmhead;
                else if(gvar->mm.mmrover == start)
                {
-                       Quit("MM_SetLock: Block not found!");
+                       Quit (gvar, "MM_SetLock: Block not found!");
                        //return;
                }
 
@@ -1202,8 +1171,8 @@ void MM_SortMem(global_game_variables_t *gvar)
 {
        //huge mmblocktype huge *scan,huge *last,huge *next;
        mmblocktype far *scan,far *last,far *next;
-       unsigned        start,length,source,dest,oldborder;
-       int                     playing;
+       unsigned        start,length,source,dest;//++++,oldborder;
+       //++++int                       playing;
 
        //
        // lock down a currently playing sound
@@ -1313,18 +1282,18 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 {
        //huge mmblocktype huge *scan;
        mmblocktype far *scan;
-       word temp;
+       //word temp;
        sdword  end,owner;
        //word chx,chy;
        word w;
        //dword wwww;
-       byte    scratch[160],scratch0[4096],scratch1[160],str[16];
+       byte    scratch[160],scratch0[4096],str[16];//[[[[scratch1[160],
        //byte d = '#';
-//**** VW_SetDefaultColors();
-//**** VW_SetLineWidth(40);
+//[[[[ VW_SetDefaultColors();
+//[[[[ VW_SetLineWidth(40);
 //++++mh       temp = bufferofs;
 //++++mh       bufferofs = 0;
-//**** VW_SetScreen (0,0);
+//[[[[ VW_SetScreen (0,0);
        scan = gvar->mm.mmhead;
        end = -1;
 
@@ -1619,21 +1588,22 @@ void MM_Report_(global_game_variables_t *gvar)
                printf("        %cLIMEMS        %u\n", 0xC9, gvar->pm.emm.EMSPresent);
                printf("        %c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
                printf("        %c%ctotalEMSpages:      %u      ", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages:       %u\n", gvar->pm.emm.freeEMSpages);
-               printf("        %c%cEMSPageFrame:       %04x\n", 0xD3, 0xC4, gvar->pm.emm.EMSPageFrame);
+               printf("        %c%cEMSPageFrame:       %04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame);
+               printf("        %c%cEMSmem:     %lu\n", 0xD3, 0xC4, gvar->mmi.EMSmem);
        }
        if(MML_CheckForXMS())
        {
                printf("        %cXMS   %u\n", 0xC9, gvar->pm.xmm.XMSPresent);
-//++++         printf("                XMS v%x.%x available\n", gvar->pm.xmm.XMSVer>>4,gvar->pm.xmm.XMSVer&0x0F);
+               printf("        %c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F);
                printf("        %c%cXMSDriver:  %Fp\n", 0xC7, 0xC4, XMSDriver);
-               printf("        %c%cXMSHandle:  %04x\n", 0xD3, 0xC4, gvar->pm.xmm.XMSHandle);
+               printf("        %c%cXMSHandle:  %04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle);
+               printf("        %c%cXMSmem:     %lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem);
        }
        printf("        %cConv. %u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0);
        //printf("mainmem:      %lu\n", gvar->mmi.mainmem);
        //printf("Total convmem:        %lu     ", gvar->mmi.mainmem); printf("TotalFree:       %lu     ", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed:   %lu\n", gvar->mmi.mainmem);
        //printf("                      UnusedMemory:   %lu\n", MM_UnusedMemory(gvar));
        printf("nearheap:       %lu             ", gvar->mmi.nearheap); printf("farheap:        %lu\n", gvar->mmi.farheap);
-       if(MML_CheckForEMS()) printf("EMSmem:           %lu     ", gvar->mmi.EMSmem); if(MML_CheckForXMS()) printf("XMSmem:             %lu", gvar->mmi.XMSmem); printf("\n");
 }
 
 //==========================================================================