From 67a49e712a4b3df9c6373174c20dfcc6308935e6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 28 Dec 2007 07:45:22 +0000
Subject: Bugfix for string decoding to use the article of the destination
 character rather than the talking character

svn-id: r30036
---
 engines/lure/surface.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 5cdd338ab1..ac5716f676 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -641,7 +641,7 @@ TalkDialog::TalkDialog(uint16 characterId, uint16 destCharacterId, uint16 active
 	char srcCharName[MAX_DESC_SIZE];
 	char destCharName[MAX_DESC_SIZE];
 	char itemName[MAX_DESC_SIZE];
-	int characterArticle, hotspotArticle = 0;
+	int characterArticle = 0, hotspotArticle = 0;
 
 	_characterId = characterId;
 	_destCharacterId = destCharacterId;
@@ -656,11 +656,12 @@ TalkDialog::TalkDialog(uint16 characterId, uint16 destCharacterId, uint16 active
 	assert(talkingChar);
 
 	strings.getString(talkingChar->nameId & 0x1fff, srcCharName);
-	characterArticle = getArticle(descId, talkingChar->nameId);
 
 	strcpy(destCharName, "");
-	if (destCharacter != NULL)
+	if (destCharacter != NULL) {
 		strings.getString(destCharacter->nameId, destCharName);
+		characterArticle = getArticle(descId, destCharacter->nameId);
+	}
 	strcpy(itemName, "");
 	if (itemHotspot != NULL) {
 		strings.getString(itemHotspot->nameId & 0x1fff, itemName);
-- 
cgit v1.2.3