not going to work on it until wednesday

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index b338e5910e3515bfa8a6722429595e00109de6df..5bbdca711f8f542fdb6433ddf12abfbaf0b237a1 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -48,6 +48,7 @@ Open Watcom port by sparky4
 */
 #include "src/lib/16_mm.h"
 #include "src/lib/16_ca.h"
+#include <malloc.h>
 #pragma hdrstop
 
 #pragma warn -pro
@@ -787,10 +788,10 @@ void MM_Startup(global_game_variables_t *gvar)
 #ifdef __WATCOMC__
        _nheapgrow();
        length=(dword)_memavl();//(dword)GetFreeSize();
-       start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
+       start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
-       length=coreleft();
+       length=(word)coreleft();
        start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
        length -= 16-(FP_OFF(start)&15);
@@ -799,7 +800,7 @@ void MM_Startup(global_game_variables_t *gvar)
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, gvar);
        gvar->mmi.nearheap = length;
-       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
+       //0000printf("near:     start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);
 
 //
 // get all available far conventional memory segments
@@ -810,8 +811,8 @@ void MM_Startup(global_game_variables_t *gvar)
        length=_FCORELEFT;//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
 #ifdef __BORLANDC__
-       printf("farcoreleft()                           %lu\n", farcoreleft());
-       printf("(farcoreleft()+32)-_FCORELEFT   %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
+//0000 printf("farcoreleft()                           %lu\n", farcoreleft());
+//0000 printf("(farcoreleft()+32)-_FCORELEFT   %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));
        length=farcoreleft();//_fcoreleft();//(dword)GetFarFreeSize();//0xffffUL*4UL;
 #endif
        start = gvar->mm.farheap = _fmalloc(length);
@@ -822,7 +823,7 @@ void MM_Startup(global_game_variables_t *gvar)
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
        MML_UseSpace(segstart,seglength, gvar);
        gvar->mmi.farheap = length;
-       //printf("start=%Fp     segstart=%x     seglen=%lu      len=%lu\n", start, segstart, seglength, length);
+       //0000printf("far:      start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);
 
        gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;