From d027aafb4cb00e152570e07ba273d757aea85db9 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 9 Jul 2006 20:04:05 +0000
Subject: [PATCH] - Fixed: If the sector behind a seg was closed, but it was
 closed between the   ceiling and floor of the front sector, the renderer did
 not add it to the   solid clip list. - Blends created with the ACS fade
 commands now degrade to transparent overlays   when the console is visible,
 just as they do for the menu.

SVN r240 (trunk)
---
 docs/rh-log.txt              |  7 +++++++
 src/c_console.cpp            | 12 ++++++++++++
 src/g_shared/shared_sbar.cpp |  3 ++-
 src/r_bsp.cpp                |  7 +++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index b94d2010d..e3a07711f 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,9 +1,16 @@
+July 9, 2006
+- Fixed: If the sector behind a seg was closed, but it was closed between the
+  ceiling and floor of the front sector, the renderer did not add it to the
+  solid clip list.
+
 July 8, 2006 (Changes by Graf Zahl)
 - Fixed: Specifying 'strifefallingdamage' in MAPINFO cleared all other flags.
 - Fixed: maxstepheight and maxdropoffheight were stored as ints instead of 
   fixed_t's by the DECORATE parser.
 
 July 7, 2006
+- Blends created with the ACS fade commands now degrade to transparent overlays
+  when the console is visible, just as they do for the menu.
 - Added actor replacement for DECORATE. This works at a higher level than
   using duplicate DoomEdNums and will affect all attempts to spawn the
   replaced actor. However, because this happens for all spawns and not just
diff --git a/src/c_console.cpp b/src/c_console.cpp
index 3b1951837..48c3c4348 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -1193,6 +1193,18 @@ void C_DrawConsole ()
 				TickerVisible = false;
 			}
 		}
+
+		// Apply palette blend effects
+		if (StatusBar != NULL)
+		{
+			player_t *player = StatusBar->CPlayer;
+			if (player->camera != NULL && player->camera->player != NULL)
+			{
+				player = player->camera->player;
+			}
+			screen->Dim (PalEntry (player->BlendR*255, player->BlendG*255, player->BlendB*255),
+				player->BlendA, 0, ConBottom, screen->GetWidth(), screen->GetHeight() - ConBottom);
+		}
 	}
 
 	if (menuactive != MENU_Off)
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index b71f3bb1c..a4548df0a 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -38,6 +38,7 @@
 #include "sbar.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
+#include "c_console.h"
 #include "v_video.h"
 #include "m_swap.h"
 #include "r_draw.h"
@@ -1370,7 +1371,7 @@ void FBaseStatusBar::BlendView (float blend[4])
 		AddBlend (0.25f, 0.25f, 0.853f, 0.4f, blend);
 	}
 
-	if (CPlayer->camera != NULL && menuactive == MENU_Off)
+	if (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/r_bsp.cpp b/src/r_bsp.cpp
index 5a94b2696..7445be7f7 100644
--- a/src/r_bsp.cpp
+++ b/src/r_bsp.cpp
@@ -748,6 +748,13 @@ void R_AddLine (seg_t *line)
 		{
 			solid = true;
 		}
+		// [RH] Check for completely closed back sector. This worked in
+		// 1.22, so I assume I accidentally broke it when I added slopes.
+		else if (rw_backcz1 <= rw_backfz1 && rw_backcz2 <= rw_backfz2)
+		{
+			solid = true;
+			doorclosed = true;
+		}
 		else if (
 			(backsector->ceilingpic != skyflatnum ||
 			frontsector->ceilingpic != skyflatnum)