A few more cleanups and fixes

src/id_ca.c

@@ -938,7 +938,6 @@ void CA_CacheScreen (int chunk)
 //
 	/* TODO: this cheats and expands to the 320x200 screen buffer */
 	CAL_HuffExpand(source, gfxbuf, expanded, grhuffman);
-	VW_MarkUpdateBlock (0,0,319,199);
 	MM_FreePtr(&bigbufferseg);
 }
 

src/wl_act2.c

@@ -3778,7 +3778,6 @@ void	A_StartDeathCam (objtype *ob)
 	VW_Bar (0,0,320,200-STATUSLINES,127);
 	FizzleFade(bufferofs,displayofs,320,200-STATUSLINES,70,false);
 
-	PM_UnlockMainMem ();
 	CA_UpLevel ();
 	CacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
 	#ifdef JAPAN
@@ -3789,7 +3788,6 @@ void	A_StartDeathCam (objtype *ob)
 	Write(0,7,STR_SEEAGAIN);
 	#endif
 	CA_DownLevel ();
-	PM_CheckMainMem ();
 
 	VW_UpdateScreen ();
 

src/wl_debug.c

@@ -224,7 +224,7 @@ static	char	buf[10];
 
 		US_Print("\n Address: ");
 		addr = PM_GetPageAddress(i);
-		sprintf(buf,"0x%04x",(word)addr);
+		sprintf(buf,"%p", addr); /* TODO: might wanna check */
 		US_Print(buf);
 
 		if (addr)
@@ -236,11 +236,10 @@ static	char	buf[10];
 			//
 				postx = 128;
 				postwidth = 1;
-				postsource = ((long)((unsigned)addr))<<16;
 				for (x=0;x<64;x++,postx++,postsource+=64)
 				{
 					wallheight[postx] = 256;
-					FarScalePost ();
+					ScalePost((byte *)addr, x);
 				}
 			}
 			else if (i < PMSoundStart)

src/wl_game.c

@@ -189,7 +189,6 @@ void UpdateSoundLoc(void)
 
 void ClearMemory (void)
 {
-	PM_UnlockMainMem();
 	SD_StopDigitized();
 	MM_SortMem ();
 }
@@ -996,7 +995,6 @@ void RecordDemo (void)
 
 	SetupGameLevel ();
 	StartMusic ();
-	PM_CheckMainMem ();
 	fizzlein = true;
 
 	PlayLoop ();
@@ -1062,7 +1060,6 @@ void PlayDemo (int demonumber)
 
 	SetupGameLevel ();
 	StartMusic ();
-	PM_CheckMainMem ();
 	fizzlein = true;
 
 	PlayLoop ();
@@ -1250,7 +1247,6 @@ restart:
 
 		ingame = true;
 		StartMusic ();
-		PM_CheckMainMem ();
 		if (!died)
 			PreloadGraphics ();
 		else
@@ -1283,7 +1279,6 @@ startplayloop:
 			gamestate.mapon = 20;
 			SetupGameLevel ();
 			StartMusic ();
-			PM_CheckMainMem ();
 			player->x = spearx;
 			player->y = speary;
 			player->angle = spearangle;

src/wl_menu.c

@@ -773,8 +773,6 @@ int CP_CheckQuick(unsigned scancode)
 
 				lasttimecount = TimeCount;
 
-				PM_CheckMainMem ();
-
 				#ifndef SPEAR
 				UNCACHEGRCHUNK(C_CURSOR1PIC);
 				UNCACHEGRCHUNK(C_CURSOR2PIC);
@@ -815,11 +813,6 @@ int CP_CheckQuick(unsigned scancode)
 				SD_StopSound();
 				MenuFadeOut();
 
-				//
-				// SHUT-UP THE ADLIB
-				//
-				for (i=1;i<=0xf5;i++)
-					alOut(i,0);
 				Quit(NULL);
 			}
 
@@ -2828,11 +2821,6 @@ void CP_Quit(void)
 		SD_MusicOff();
 		SD_StopSound();
 		MenuFadeOut();
-		//
-		// SHUT-UP THE ADLIB
-		//
-		for (i=1;i<=0xf5;i++)
-			alOut(i,0);
 		Quit(NULL);
 	}