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

[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:
a3fb5ab1fb SHERLOCK: RT: Fix cmdSetNPCDescOnOff method


Commit: a3fb5ab1fbb0cf3ff448ba9e9966ef21c7dc3847
    https://github.com/scummvm/scummvm/commit/a3fb5ab1fbb0cf3ff448ba9e9966ef21c7dc3847
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-12T21:21:55-04:00

Commit Message:
SHERLOCK: RT: Fix cmdSetNPCDescOnOff method

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 0d2e1a9..f01cdb0 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -389,15 +389,19 @@ OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) {
 
 	// Copy over the NPC examine text until we reach a stop marker, which is
 	// the same as a start marker, or we reach the end of the file
-	while (*str && *str != 208)
+	while (*str && *str != _opcodes[OP_NPC_DESC_ON_OFF])
 		person._examine += *str++;
 
 	// Move past any leftover text till we reach a stop marker
-	while (*str && *str != 208)
+	while (*str && *str != _opcodes[OP_NPC_DESC_ON_OFF])
 		str++;
 
 	if (!*str)
-		str--;
+		// Reached end of file, so decrement pointer so outer loop will terminate on NULL
+		--str;
+	else
+		// Move past the ending OP_NPC_DEST_ON_OFF opcode
+		++str;
 
 	return RET_SUCCESS;
 }