- Fixed: With hardware 2D, the console and menu need not reimplement palette

flashes to ensure their visibility.
- Fixed: DFlashFader::Destroy() did not call its super method.


SVN r985 (trunk)

docs/rh-log.txt

@@ -1,4 +1,7 @@
 May 20, 2008
+- Fixed: With hardware 2D, the console and menu need not reimplement palette
+  flashes to ensure their visibility.
+- Fixed: DFlashFader::Destroy() did not call its super method.
 - Fixed: If a player was morphed into a class with a taller view height,
   their perceived view height would not change until they walked up a step.
 

src/c_console.cpp

@@ -1206,7 +1206,7 @@ void C_DrawConsole (bool hw2d)
 		}
 
 		// Apply palette blend effects
-		if (StatusBar != NULL)
+		if (StatusBar != NULL && !hw2d)
 		{
 			player_t *player = StatusBar->CPlayer;
 			if (player->camera != NULL && player->camera->player != NULL)

src/g_shared/a_flashfader.cpp

@@ -22,6 +22,7 @@ DFlashFader::DFlashFader (float r1, float g1, float b1, float a1,
 void DFlashFader::Destroy ()
 {
 	SetBlend (1.f);
+	Super::Destroy();
 }
 
 void DFlashFader::Serialize (FArchive &arc)

src/g_shared/shared_sbar.cpp

@@ -1478,7 +1478,7 @@ void DBaseStatusBar::BlendView (float blend[4])
 		AddBlend (0.25f, 0.25f, 0.853f, 0.4f, blend);
 	}
 
-	if (CPlayer->camera != NULL && menuactive == MENU_Off && ConsoleState == c_up)
+	if (screen->Accel2D || (CPlayer->camera != NULL && menuactive == MENU_Off && ConsoleState == c_up))
 	{
 		player_t *player = (CPlayer->camera->player != NULL) ? CPlayer->camera->player : CPlayer;
 		AddBlend (player->BlendR, player->BlendG, player->BlendB, player->BlendA, blend);

src/m_menu.cpp

@@ -3136,7 +3136,7 @@ void M_Drawer ()
 	PalEntry fade = 0;
 
 	const player_t *player = &players[consoleplayer];
-	if (player->camera != NULL && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL))
+	if (!screen->Accel2D && player->camera != NULL && (gamestate == GS_LEVEL || gamestate == GS_TITLELEVEL))
 	{
 		if (player->camera->player != NULL)
 		{