reverted

	modified:   16.exe
	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   sountest.exe
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h

diff --git a/16.exe b/16.exe
index d6f4bcd601510279380ea2db547dd7a3963d46ed..3bc10dcf6093ca0896fe16deb61f81fd74437f42 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/DEBUG.TXT b/DEBUG.TXT
index d17d463ad2ab4d7202a063765a115e643d83f0be..d71980c4ca16fc914b4bd2e7e2b91f872efd1083 100644 (file)
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,5 +1,5 @@
 Seg:0  Size:140384     Owner:0x84a\r
-Seg:2246       Size:4096       Owner:0xfb30\r
+Seg:2246       Size:4096       Owner:0xfb32\r
 Seg:2346       Size:31344      Owner:0x1c68\r
 Seg:3054       Size:1026592    Owner:0x468b\r
 Seg:3924       Size:683456     Owner:0x5657\r

diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 2e9f8d883f5d2fa625817f8ea7d55ed4d7fa9c19..18431f44413f4c806ff4c46b43ab50d342aa1a68 100644 (file)
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 921a722554a8214c223685d90dc305dbb8f5086b..45ae666753ac250f49b98dc31c5bba3caa7133eb 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index f74dc944a130bb5cb4235dc1bbcfc31b405efef1..624bc60e3c0778ebfc955ae0e52d32f11e85b1b7 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 01ff581c0327402a47e6ce3c644c824a77bf7ba8..d182022a808c6bbbc061602b8a3ca1a7b2098238 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttes0.exe b/fonttes0.exe
index aab4b03eddbebabb5c376f9bd644a31a2d826111..14e72e35180f48ed6e82d6b5bd5b03f93c2c0187 100644 (file)
Binary files a/fonttes0.exe and b/fonttes0.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 2cc9c1d75c120bf84c842769edbe8ab4f869bcd0..be48aee686d85a3d55fe4b4d8a7b972b5cbe9098 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 6f4abf7b07386546c32640a1ddc5bdd7d795b88b..356698ef42edaa10334e8def4d80b8fea1190076 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index d45227a986d28e0a7c9d05d16dddde30c4df9c70..393babfde024678779544ec09f7f5dd1b204d858 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/sountest.exe b/sountest.exe
index ee68b76bdb5d04c6446d90975a9fd5081430db44..10eefab6aa47af06c9b09462ad163a2dddbb5110 100644 (file)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 3d81976c80c65907c71d2804796a11c260256b6f..24f78c5bd67e5499be869a796f1f7b99b59a22d0 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -372,7 +372,6 @@ char        str[80];//,str2[10];
        }
        return 0;
 */
-       return 0;
 }
 
 //==========================================================================
@@ -500,7 +499,7 @@ void MML_ShutdownXMS(mminfo_t *mm)
 void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
 {
        mmblocktype huge *scan,huge *last;
-       //word          segm;
+       word            segm;
        dword   oldend;
        dword           extra;
 
@@ -519,13 +518,13 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
        //find out how many blocks it spans!
        if(seglength>0xffffu)
        {
-//             scan->segm=seglength/0x4000u;
-               scan->segm=seglength/0xffffu;
+//             segm=seglength/0x4000u;
+               segm=seglength/0xffffu;
        }
-       else scan->segm=1;
+       else segm=1;
 
        //++++emsver stuff!
-       if(scan->segm>1/*extra>0xfffflu*/)
+       if(segm>1/*extra>0xfffflu*/)
        {
                /*__asm
                {
@@ -551,7 +550,7 @@ void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm)
        oldend = scan->start + scan->length;
        extra = oldend - (segstart+seglength);
 
-printf("segm=%u        ", scan->segm);
+printf("segm=%u        ", segm);
 printf("ex=%lu ", extra);
 printf("start+seglen=%lu       ", segstart+seglength);
 printf("len=%u ", scan->length);

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 13b6b5e9ce3e9c873d70715ddb0e2aaa44f7f5ae..8570016c53f05131cc809b0ef61ae6554279fdfb 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -122,7 +122,7 @@ typedef struct mmblockstruct
        //dword start,length;
        //word  start;
        //dword length;
-       word segm;                              //how many 64kb segment blocks it takes up if there is many data!
+       //byte segm;                            //how many 64kb segment blocks it takes up if there is many data!
        unsigned        attributes;
        memptr          *useptr;        // pointer to the segment start
        struct mmblockstruct huge *next;