X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=2db7556144c0530e9463c8606a289e1c4df9e368;hb=221553c7aa69dddd3f2ed960062080c60fcacf58;hp=9a01862a667e9c908c236a92347201ba7331fa1e;hpb=6a98c81b36a1b7e4103d81050f1c9ec04aa85996;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 9a01862a..2db75561 100644
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -26,7 +26,6 @@
 #include "src/lib/16_head.h"
 #include "src/lib/16_hc.h"
 //#include "src/lib/modex16.h"
-//#include "src/lib/16_ca.h"
 //++++mh	#include "src/lib/16_in.h"
 
 #ifdef __DEBUG__		// 1 == Debug/Dev  ;  0 == Production/final
@@ -36,17 +35,26 @@
 #endif
 
 //#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}
-#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;mm->endid++;}
+#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;}
 
-#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;mm->endid--;}
+#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
 
+#define AARED		"\x1b[41;31m"
+#define AABLUE		"\x1b[44;34m"
+#define AAGREEN	"\x1b[42;32m"
+#define AAYELLOW	"\x1b[43;33m"
+#define AAGREY		"\x1b[47;37m"
+#define AABLACK	"\x1b[40;30m"
+#define AAWHITE		"\x1b[47;37m"
+#define AAMAGENTA	"\x1b[45;35m"
+#define AARESET	"\x1b[0m"
 
 #define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP	0//x400			// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
 
-#define MAXBLOCKS		720
+#define MAXBLOCKS		1024
 
 
 
@@ -123,6 +131,7 @@ typedef struct mmblockstruct
 {
 	//word	start,length;
 	word	start;	dword length;
+	word	blob;	//for data larger than 64k
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
 	struct mmblockstruct huge *next;
@@ -144,7 +153,6 @@ typedef struct
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	unsigned int EMSVer;
 	word numUMBs,UMBbase[MAXUMBS];
-	word	endid;	//end of list
 	//dword	numUMBs,UMBbase[MAXUMBS];
 	mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
 } mminfo_t;
@@ -176,7 +184,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi);
 boolean MML_CheckForXMS(mminfo_t *mm);
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);
 void MML_ShutdownXMS(mminfo_t *mm);
-void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm);
+void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm);
 void MML_ClearBlock(mminfo_t *mm);
 
 void MM_Startup(mminfo_t *mm, mminfotype *mmi);
@@ -187,7 +195,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(/*page_t *page, */mminfo_t *mm);
+void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);