==== OK i removed all warnings wwww

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 075f54b09c502505286356e617b5c31b31aa8016..df1dd7f7fef2222f312f848279042e4963efa9be 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -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
@@ -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;
 
@@ -769,9 +770,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;
 
 //
@@ -842,23 +841,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 +863,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 +874,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 +908,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 +917,7 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __DEBUG__
        }
 #endif
+#endif
 }
 
 //==========================================================================
@@ -1202,8 +1175,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 +1286,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;
 
@@ -1625,9 +1598,9 @@ void MM_Report_(global_game_variables_t *gvar)
        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);