aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2007-11-08 10:51:47 +0000
committerPaul Gilbert2007-11-08 10:51:47 +0000
commitcafc46fc8f369eba28031b949326733b6f89754e (patch)
tree1d8d4346d657782ebbbfb4ccc349d4fbfe4b9ea7 /engines
parentea19791de5fa24ea51eee2b82d18b5943eb5c808 (diff)
downloadscummvm-rg350-cafc46fc8f369eba28031b949326733b6f89754e.tar.gz
scummvm-rg350-cafc46fc8f369eba28031b949326733b6f89754e.tar.bz2
scummvm-rg350-cafc46fc8f369eba28031b949326733b6f89754e.zip
Bugfix for correct use of article prefixes on character names embedded in talk messages
svn-id: r29450
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/strings.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp
index 3c90af91c3..c05f01a511 100644
--- a/engines/lure/strings.cpp
+++ b/engines/lure/strings.cpp
@@ -199,12 +199,15 @@ void StringData::getString(uint16 stringId, char *dest, const char *hotspotName,
// Copy over hotspot or action
ch = readCharacter();
const char *p = (ch == '1') ? hotspotName : characterName;
- int article = !includeArticles ? 3 : ((ch == 1) ? hotspotArticle : characterArticle);
+ int article = !includeArticles ? 0 : ((ch == 1) ? hotspotArticle : characterArticle);
if (p != NULL) {
- if (article > 0)
+ if (article > 0) {
strcpy(destPos, stringList.getString(S_ARTICLE_LIST + article - 1));
- strcat(destPos, p);
+ strcat(destPos, p);
+ } else {
+ strcpy(destPos, p);
+ }
destPos += strlen(destPos);
}
} else if ((uint8) ch >= 0xa0) {