====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke====

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 8d93438a3c0d27ebd6a1ebe958ad6ff532684793..561c67f1d610c0d7cf4e523b6912df9790d424f5 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -345,7 +345,6 @@ byte MM_MapEMS(global_game_variables_t *gvar)
                }
        }
        gvar->mmi.EMSmem = (i)*0x4000lu;
-       //printf("              gvar->mmi.EMSmem=%lu\n", gvar->mmi.EMSmem);
        return 0;
 }
 
@@ -1628,7 +1627,7 @@ void MM_Report_(global_game_variables_t *gvar)
                printf("                XMSaddr:        %X\n", *XMSaddr);
        }
        printf("near:   %lu     ", gvar->mmi.nearheap); printf("far:    %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS())
-       printf("EMSmem: %lu     ", gvar->pm.emm.EMSAvail/*gvar->mmi.EMSmem*/); if(MML_CheckForXMS(gvar)) printf("XMSmem:        %lu", gvar->mmi.XMSmem); printf("\n");
+       printf("EMSmem: %lu     ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n");
        //printf("mainmem:      %lu\n", gvar->mmi.mainmem);
        printf("Total convmem:  %lu     ", gvar->mmi.mainmem); printf("TotalFree:       %lu     ", MM_TotalFree(gvar)); printf("TotalUsed:      %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem);
        printf("                        UnusedMemory:   %lu\n", MM_UnusedMemory(gvar));

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 848af9c824b4276790bf01d9e9ced475351ca4fa..75ad2aae103f2034078d45e44b4de8700af9159b 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -150,6 +150,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
        totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
        gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
+       gvar->mmi.EMSmem = 0;\r
 \r
        __asm {\r
                mov     dx,OFFSET emmname       //fix by andrius4669\r