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

[dreammaster at users.sourceforge.net]

Revision: 29450
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29450&view=rev
Author:   dreammaster
Date:     2007-11-08 02:51:47 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Bugfix for correct use of article prefixes on character names embedded in talk messages

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

Modified: scummvm/trunk/engines/lure/strings.cpp
===================================================================
--- scummvm/trunk/engines/lure/strings.cpp	2007-11-08 10:50:26 UTC (rev 29449)
+++ scummvm/trunk/engines/lure/strings.cpp	2007-11-08 10:51:47 UTC (rev 29450)
@@ -199,12 +199,15 @@
 			// 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) {


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