From 0006013531e98fc9a1e78530521a9b2eeb637784 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 4 Oct 2009 11:46:51 +0000
Subject: [PATCH] - Fixed: The conversation code tried to get the player's tag
 instead of the   NPC's he is talking to when it had no given name.

SVN r1896 (trunk)
---
 docs/rh-log.txt        | 4 ++++
 src/p_conversation.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index ab1d13ce06..bd38a2da3e 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+October 4, 2009  (Changes by Graf Zahl)
+- Fixed: The conversation code tried to get the player's tag instead of the
+  NPC's he is talking to when it had no given name.
+
 October 3, 2009  (Changes by Graf Zahl)
 - Added Gez's MageWandMissile customization patch but moved the new functionality
   into the FastProjectile base class and removed the native MageWandMissile
diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 94feffe95e..23147343b1 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -875,7 +875,7 @@ static void DrawConversationMenu ()
 	}
 	else
 	{
-		speakerName = cp->mo->GetTag("Person");
+		speakerName = cp->ConversationNPC->GetTag("Person");
 	}
 
 	// Dim the screen behind the dialogue (but only if there is no backdrop).