From: sparky4 <sparky4@cock.li>
Date: Tue, 21 Jul 2015 13:50:29 +0000 (-0500)
Subject: reverted
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=3119d646a3ac718b578307e7672ca78d7fbbc3ca

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 d6f4bcd6..3bc10dcf 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/DEBUG.TXT b/DEBUG.TXT
index d17d463a..d71980c4 100644
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,5 +1,5 @@
 Seg:0	Size:140384	Owner:0x84a
-Seg:2246	Size:4096	Owner:0xfb30
+Seg:2246	Size:4096	Owner:0xfb32
 Seg:2346	Size:31344	Owner:0x1c68
 Seg:3054	Size:1026592	Owner:0x468b
 Seg:3924	Size:683456	Owner:0x5657
diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 2e9f8d88..18431f44 100644
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 921a7225..45ae6667 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index f74dc944..624bc60e 100644
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 01ff581c..d182022a 100644
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttes0.exe b/fonttes0.exe
index aab4b03e..14e72e35 100644
Binary files a/fonttes0.exe and b/fonttes0.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 2cc9c1d7..be48aee6 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 6f4abf7b..356698ef 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index d45227a9..393babfd 100644
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/sountest.exe b/sountest.exe
index ee68b76b..10eefab6 100644
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 3d81976c..24f78c5b 100644
--- 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 13b6b5e9..8570016c 100644
--- 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;