X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=55a7d3710e96933296e417961cfa348c72b30aac;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=4d9ac9d8f7874515369dfa8f2fcbfb75a6ad9533;hpb=a1ebc8babe13647bcdbcb1b493ca2358808bbeeb;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 4d9ac9d8..55a7d371 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -139,7 +139,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 		strcpy(str,"MM_MapEMS: EMS error ");
 		MM_EMSerr(str, err);
 		printf("%s\n",str);
-		Quit (gvar, "PML_MapEMS: Page mapping failed\n");
+		Quit ("PML_MapEMS: Page mapping failed\n");
 		return err;
 	}
 	return 0;
@@ -326,7 +326,7 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 			strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");
 			MM_EMSerr(str, err);
 			printf("%s\n",str);
-			Quit (gvar, "PML_ShutdownEMS: Error freeing EMS\n");
+			Quit ("PML_ShutdownEMS: Error freeing EMS\n");
 			//return;
 		}
 	}
@@ -506,8 +506,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 
 	if (!addr)
 	{
-		Quit (gvar, "PML_XMSCopy: zero address\n");
-		//return;
+		Quit ("PML_XMSCopy: zero address\n");
 	}
 
 	xoffset = (dword)xmspage * PMPageSize;
@@ -528,7 +527,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 	}
 	if (!_AX)
 	{
-		Quit (gvar, "PML_XMSCopy: Error on copy");
+		Quit ("PML_XMSCopy: Error on copy");
 		//return;
 	}
 }
@@ -595,7 +594,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 #endif
 		if(errorflag==true)
 		{
-			Quit (gvar, "PML_ShutdownXMS: Error freeing XMS");
+			Quit ("PML_ShutdownXMS: Error freeing XMS");
 			//return;
 		}
 	}
@@ -621,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 	for (i = 0;i < PMMaxMainMem;i++)
 	{
 #ifdef __DEBUG_PM__
+#ifdef __DEBUG_PM_MAIN__
 		printf("PM_SetMainMemPurge()	info of gvar->pm.mm.MainMemPages[i]\n");
 		printf("&	%Fp,	%Fp\n", &gvar->pm.mm.MainMemPages[i],	&(gvar->pm.mm.MainMemPages[i]));
+#endif
 #endif
 		if (gvar->pm.mm.MainMemPages[i])
 			MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);
@@ -630,7 +631,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 
 	else
 	{
-		Quit (gvar, "MainPresent IS NULL\n");
+		Quit ("MainPresent IS NULL\n");
 	}
 }
 
@@ -739,7 +740,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
 		gvar->mm.mmerror = false;
 	if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)
 	{
-		Quit (gvar, "PM_SetupMainMem: Not enough main memory");
+		Quit ("PM_SetupMainMem: Not enough main memory");
 		//return;
 	}
 	gvar->pm.mm.MainPresent = true;
@@ -775,22 +776,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t
 {
 	if (!buf)
 	{
-		Quit (gvar, "PML_ReadFromFile: Null pointer");
+		Quit ("PML_ReadFromFile: Null pointer");
 		//return;
 	}
 	if (!offset)
 	{
-		Quit (gvar, "PML_ReadFromFile: Zero offset");
+		Quit ("PML_ReadFromFile: Zero offset");
 		//return;
 	}
 	if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)
 	{
-		Quit (gvar, "PML_ReadFromFile: Seek failed");
+		Quit ("PML_ReadFromFile: Seek failed");
 		//return;
 	}
 	if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))
 	{
-		Quit (gvar, "PML_ReadFromFile: Read failed");
+		Quit ("PML_ReadFromFile: Read failed");
 		//return;
 	}
 }
@@ -811,7 +812,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);
 	if (gvar->pm.fi.PageFile == -1)
 	{
-		Quit (gvar, "PML_OpenPageFile: Unable to open page file");
+		Quit ("PML_OpenPageFile: Unable to open page file");
 		//return;
 	}
 
@@ -832,7 +833,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	MM_GetPtr((memptr *)&buf, size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit (gvar, "PML_OpenPageFile: Offset read failed");
+		Quit ("PML_OpenPageFile: Offset read failed");
 		//return;
 	}
 	offsetptr = (dword far *)buf;
@@ -845,7 +846,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	MM_GetPtr(&buf,size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
-		Quit (gvar, "PML_OpenPageFile: Length read failed");
+		Quit ("PML_OpenPageFile: Length read failed");
 		//return;
 	}
 	lengthptr = (word far *)buf;
@@ -922,7 +923,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)
 	}
 
 	if (emspage == -1)
-		Quit (gvar, "PML_GetEMSAddress: EMS find failed");
+		Quit ("PML_GetEMSAddress: EMS find failed");
 
 	gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;
 	offset = emspage * EMSPageSizeSeg;
@@ -991,7 +992,7 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
 	}
 
 	if (lru == -1)
-		Quit (gvar, "PML_GiveLRUPage: LRU Search failed");
+		Quit ("PML_GiveLRUPage: LRU Search failed");
 	return(lru);
 }
 
@@ -1046,7 +1047,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
 	{
 		usexms = PML_GiveLRUXMSPage(gvar);
 		if (usexms == -1)
-			Quit (gvar, "PML_PutPageInXMS: No XMS LRU");
+			Quit ("PML_PutPageInXMS: No XMS LRU");
 		page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;
 		gvar->pm.PMPages[usexms].xmsPage = -1;
 	}
@@ -1064,16 +1065,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
 	PageListStruct	far *origpage,far *newpage;
 
 	if (orig == new)
-		Quit (gvar, "PML_TransferPageSpace: Identity replacement");
+		Quit ("PML_TransferPageSpace: Identity replacement");
 
 	origpage = &gvar->pm.PMPages[orig];
 	newpage = &gvar->pm.PMPages[new];
 
 	if (origpage->locked != pml_Unlocked)
-		Quit (gvar, "PML_TransferPageSpace: Killing locked page");
+		Quit ("PML_TransferPageSpace: Killing locked page");
 
 	if ((origpage->emsPage == -1) && (origpage->mainPage == -1))
-		Quit (gvar, "PML_TransferPageSpace: Reusing non-existent page");
+		Quit ("PML_TransferPageSpace: Reusing non-existent page");
 
 	// Copy page that's about to be purged into XMS
 	PML_PutPageInXMS(orig, gvar);
@@ -1089,7 +1090,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
 	origpage->mainPage = origpage->emsPage = -1;
 
 	if (!addr)
-		Quit (gvar, "PML_TransferPageSpace: Zero replacement");
+		Quit ("PML_TransferPageSpace: Zero replacement");
 
 	return(addr);
 }
@@ -1130,10 +1131,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 			}
 		}
 		if (n == -1)
-			Quit (gvar, "PML_GetPageBuffer: MainPagesAvail lied");
+			Quit ("PML_GetPageBuffer: MainPagesAvail lied");
 		addr = gvar->pm.mm.MainMemPages[n];
 		if (!addr)
-			Quit (gvar, "PML_GetPageBuffer: Purged main block");
+			Quit ("PML_GetPageBuffer: Purged main block");
 		page->mainPage = n;
 		gvar->pm.MainPagesUsed++;
 	}
@@ -1141,7 +1142,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 		addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);
 
 	if (!addr)
-		Quit (gvar, "PML_GetPageBuffer: Search failed");
+		Quit ("PML_GetPageBuffer: Search failed");
 	return(addr);
 }
 
@@ -1167,7 +1168,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
 		gvar->pm.xmm.XMSProtectPage = pagenum;
 		checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);
 		if (FP_OFF(checkaddr))
-			Quit (gvar, "PML_GetPageFromXMS: Non segment pointer");
+			Quit ("PML_GetPageFromXMS: Non segment pointer");
 		addr = (memptr)FP_SEG(checkaddr);
 		PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);
 		gvar->pm.xmm.XMSProtectPage = -1;
@@ -1205,9 +1206,9 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 	memptr	result;
 
 	if (pagenum >= gvar->pm.fi.ChunksInFile)
-		Quit (gvar, "PM_GetPage: Invalid page request");
+		Quit ("PM_GetPage: Invalid page request");
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm {
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1217,13 +1218,13 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 		mov	al,10	// bright green
 		out	dx,al
 	}
-#endif
+//#endif
 
 	if (!(result = PM_GetPageAddress(pagenum, gvar)))
 	{
 		boolean mainonly = (pagenum >= gvar->pm.fi.PMSoundStart);
 if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
-	Quit (gvar, "Tried to load a sparse page!");
+	Quit ("Tried to load a sparse page!");
 		if (!(result = PML_GetPageFromXMS(pagenum,mainonly, gvar)))
 		{
 			if (gvar->pm.PMPages[pagenum].lastHit ==  gvar->pm.PMFrameCount)
@@ -1235,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 	}
 	gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm{
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1246,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 		out	dx,al
 		mov	al,0x20	// normal
 		out	dx,al
-#endif
+	}
+//#endif
 
 	return(result);
 }
@@ -1263,7 +1265,7 @@ void
 PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)
 {
 	if (pagenum < gvar->pm.fi.PMSoundStart)
-		Quit (gvar, "PM_SetPageLock: Locking/unlocking non-sound page");
+		Quit ("PM_SetPageLock: Locking/unlocking non-sound page");
 
 	gvar->pm.PMPages[pagenum].locked = lock;
 }
@@ -1330,7 +1332,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 			page++;
 
 		if (page >= gvar->pm.fi.ChunksInFile)
-			Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
+			Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
 
 		PM_GetPage(page, gvar);
 
@@ -1349,7 +1351,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 		;
 		addr = PM_GetPage(oogypage, gvar);
 		if (!addr)
-			Quit (gvar, "PM_Preload: XMS buffer failed");
+			Quit ("PM_Preload: XMS buffer failed");
 
 		while (xmstotal)
 		{
@@ -1357,15 +1359,15 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 				page++;
 
 			if (page >= gvar->pm.fi.ChunksInFile)
-				Quit (gvar, "PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
+				Quit ("PM_Preload: Pages>=gvar->pm.fi.ChunksInFile");
 
 			p = &gvar->pm.PMPages[page];
 
 			p->xmsPage = gvar->pm.XMSPagesUsed++;
 			if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)
-				Quit (gvar, "PM_Preload: Exceeded XMS pages");
+				Quit ("PM_Preload: Exceeded XMS pages");
 			if (p->length > PMPageSize)
-				Quit (gvar, "PM_Preload: Page too long");
+				Quit ("PM_Preload: Page too long");
 
 			PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);
 			PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);
@@ -1418,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar)
 		{
 			char buf[40];
 			sprintf(buf,"PM_NextFrame: Page %d is locked",i);
-			Quit(gvar, buf);
+			Quit (buf);
 		}
 	}
 //#endif
@@ -1509,7 +1511,7 @@ PM_Startup(global_game_variables_t *gvar)
 
 	if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)
 	{
-		Quit (gvar, "PM_Startup: No main or EMS\n");
+		Quit ("PM_Startup: No main or EMS\n");
 		//return;
 	}