[Scummvm-cvs-logs] scummvm master -> bfdedb68ec96e910892cab53ca0b01c9129f56cf

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bfdedb68ec SHERLOCK: Fix cmdSetNPCInfoLine


Commit: bfdedb68ec96e910892cab53ca0b01c9129f56cf
    https://github.com/scummvm/scummvm/commit/bfdedb68ec96e910892cab53ca0b01c9129f56cf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-07T20:19:41-04:00

Commit Message:
SHERLOCK: Fix cmdSetNPCInfoLine

Changed paths:
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 91c6f25..b84cebe 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -297,15 +297,15 @@ OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) { error("TODO: scr
 
 OpcodeReturn TattooTalk::cmdSetNPCInfoLine(const byte *&str) {
 	int npcNum = *++str;
-	int len = *++str;
 	People &people = *_vm->_people;
 	Person &person = people[npcNum];
 
-	for (int x = 0; x < len; x++)
-		person._description.setChar(str[x + 1], x);
-	person._description.setChar(0, len);
-	str += len;
+	person._description = "";
+	int len = *++str;
+	for (int idx = 0; idx < len; ++idx)
+		person._description += str[idx + 1];
 
+	str += len;
 	return RET_SUCCESS;
 }