[Scummvm-cvs-logs] SF.net SVN: scummvm: [30036] scummvm/trunk/engines/lure/surface.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Fri Dec 28 08:45:22 CET 2007


Revision: 30036
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30036&view=rev
Author:   dreammaster
Date:     2007-12-27 23:45:22 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Bugfix for string decoding to use the article of the destination character rather than the talking character

Modified Paths:
--------------
    scummvm/trunk/engines/lure/surface.cpp

Modified: scummvm/trunk/engines/lure/surface.cpp
===================================================================
--- scummvm/trunk/engines/lure/surface.cpp	2007-12-28 07:44:40 UTC (rev 30035)
+++ scummvm/trunk/engines/lure/surface.cpp	2007-12-28 07:45:22 UTC (rev 30036)
@@ -641,7 +641,7 @@
 	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 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list