wwww what did i change?

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index cd99d8c..72ab5ae 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -787,11 +787,14 @@ void MM_Startup(global_game_variables_t *gvar)
 //
 #ifdef __WATCOMC__
        _nheapgrow();
-       length=(dword)_memavl();//(dword)GetFreeSize();
-       start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
+#endif
+
+       length=(word)_memavl();//(word)coreleft();//(dword)GetFreeSize();
+
+#ifdef __WATCOMC__
+       start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
-       length=coreleft();
        start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
        length -= 16-(FP_OFF(start)&15);
@@ -800,7 +803,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
@@ -811,8 +814,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);
@@ -823,11 +826,11 @@ 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;
 
-#ifndef __16_PM__
+#if !defined(__16_PM__)// && defined(__WATCOMC__)
        if(!dbg_debugpm) {
 //
 // detect EMS and allocate up to 64K at page frame