From f188577bb5851305e5c22710db74d5ff4a0a01b0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 23 Feb 2009 21:55:36 +0000
Subject: [PATCH] - Fixed: The map name display on the automap was incomplete.
 - Added FakeInventory.Respawns DECORATe property - Fixed: Unsetting the
 MF5_INCONVERSATION flag did not work when quitting the   conversation by
 pressing Escape.

SVN r1442 (trunk)
---
 docs/rh-log.txt                 |  8 +++++++-
 src/g_shared/shared_sbar.cpp    |  9 ++++++---
 src/p_conversation.cpp          |  9 +++++++--
 src/thingdef/olddecorations.cpp | 10 ++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index d286c6abd..adfc0cded 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,10 @@
-February 22, 2009  (Changes by Graf Zahl)
+February 23, 2009  (Changes by Graf Zahl)
+- Fixed: The map name display on the automap was incomplete.
+- Added FakeInventory.Respawns DECORATe property
+- Fixed: Unsetting the MF5_INCONVERSATION flag did not work when quitting the
+  conversation by pressing Escape.
+
+February 22, 2009  (Changes by Graf Zahl)
 - added ML_BLOCKPROJECTILE flag to lines.
 - Fixed: With opl_onechip set the second OPL chip was never set to anything valid
   so it contained an invalid pointer. There were also a few other places that
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index ac1d31686..46737d9d4 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -1237,14 +1237,17 @@ void DBaseStatusBar::Draw (EHudState state)
 			}
 		}
 		cluster_info_t *cluster = FindClusterInfo (level.cluster);
-		i = 0;
 		if (cluster == NULL || !(cluster->flags & CLUSTER_HUB))
 		{
-			i = mysnprintf (line, countof(line), "%s: ", level.mapname);
+			mysnprintf (line, countof(line), "%s: ", level.mapname);
+		}
+		else
+		{
+			*line = 0;
 		}
 		FString mapname;
 
-		mapname.Format("%c%c%s", TEXTCOLOR_ESCAPE, CR_GREY + 'A', level.LevelName.GetChars());
+		mapname.Format("%s%c%c%s", line, TEXTCOLOR_ESCAPE, CR_GREY + 'A', level.LevelName.GetChars());
 		screen->DrawText (SmallFont, highlight,
 			(SCREENWIDTH - SmallFont->StringWidth (mapname)*CleanXfac)/2, y, mapname,
 			DTA_CleanNoMove, true, TAG_DONE);
diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 7e97c878b..026073e3f 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -1194,17 +1194,22 @@ void P_ConversationCommand (int player, BYTE **stream)
 		break;
 
 	case CONV_SETNULL:
+		if (players[player].ConversationNPC != NULL)
+		{
+			players[player].ConversationNPC->flags5 &= ~MF5_INCONVERSATION;
+		}
 		players[player].ConversationFaceTalker = false;
 		players[player].ConversationNPC = NULL;
 		players[player].ConversationPC = NULL;
 		players[player].ConversationNPCAngle = 0;
-		// fall through
+		break;
+		
 	case CONV_CLOSE:
 		if (players[player].ConversationNPC != NULL)
 		{
 			players[player].ConversationNPC->flags5 &= ~MF5_INCONVERSATION;
 		}
-
+		break;
 
 	default:
 		break;
diff --git a/src/thingdef/olddecorations.cpp b/src/thingdef/olddecorations.cpp
index e79f61c7e..d11f9e541 100644
--- a/src/thingdef/olddecorations.cpp
+++ b/src/thingdef/olddecorations.cpp
@@ -123,6 +123,16 @@ static const char *RenderStyles[] =
 
 // CODE --------------------------------------------------------------------
 
+//==========================================================================
+//
+//==========================================================================
+DEFINE_CLASS_PROPERTY(respawns, 0, FakeInventory)
+{
+	defaults->Respawnable = true;
+}
+
+
+
 //==========================================================================
 //
 // ParseOldDecoration