From befdd0b41ff83cc9c3335492a17c1311a70cbed1 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 21 May 2008 01:47:34 +0000
Subject: [PATCH] - 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               | 3 +++
 src/c_console.cpp             | 2 +-
 src/g_shared/a_flashfader.cpp | 1 +
 src/g_shared/shared_sbar.cpp  | 2 +-
 src/m_menu.cpp                | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 2ed9ddd686..794cf6add2 100644
--- a/docs/rh-log.txt
+++ b/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.
 
diff --git a/src/c_console.cpp b/src/c_console.cpp
index 30a68dc1fd..6370142de8 100644
--- a/src/c_console.cpp
+++ b/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)
diff --git a/src/g_shared/a_flashfader.cpp b/src/g_shared/a_flashfader.cpp
index 2442dd6db9..29f0964d22 100644
--- a/src/g_shared/a_flashfader.cpp
+++ b/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)
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index 3ec0dcc480..0a24bce13f 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/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);
diff --git a/src/m_menu.cpp b/src/m_menu.cpp
index 0aa8898d17..ff4c3cab4a 100644
--- a/src/m_menu.cpp
+++ b/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)
 		{