thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix for string decoding to use the article of the destination character rather than the talking character

Browse source 
svn-id: r30036
This commit is contained in:
Paul Gilbert 2007-12-28 07:45:22 +00:00
parent ef319ad674
commit 67a49e712a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/lure/surface.cpp
View file

@ -641,7 +641,7 @@ TalkDialog::TalkDialog(uint16 characterId, uint16 destCharacterId, uint16 active
char srcCharName[MAX_DESC_SIZE]; char srcCharName[MAX_DESC_SIZE];
char destCharName[MAX_DESC_SIZE]; char destCharName[MAX_DESC_SIZE];
char itemName[MAX_DESC_SIZE]; char itemName[MAX_DESC_SIZE];
int characterArticle, hotspotArticle = 0; int characterArticle = 0, hotspotArticle = 0;
_characterId = characterId; _characterId = characterId;
_destCharacterId = destCharacterId; _destCharacterId = destCharacterId;
@ -656,11 +656,12 @@ TalkDialog::TalkDialog(uint16 characterId, uint16 destCharacterId, uint16 active
assert(talkingChar); assert(talkingChar);
strings.getString(talkingChar->nameId & 0x1fff, srcCharName); strings.getString(talkingChar->nameId & 0x1fff, srcCharName);
characterArticle = getArticle(descId, talkingChar->nameId);
strcpy(destCharName, ""); strcpy(destCharName, "");
if (destCharacter != NULL) if (destCharacter != NULL) {
strings.getString(destCharacter->nameId, destCharName); strings.getString(destCharacter->nameId, destCharName);
characterArticle = getArticle(descId, destCharacter->nameId);
}
strcpy(itemName, ""); strcpy(itemName, "");
if (itemHotspot != NULL) { if (itemHotspot != NULL) {
strings.getString(itemHotspot->nameId & 0x1fff, itemName); strings.getString(itemHotspot->nameId & 0x1fff, itemName);