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

[bluegr]

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

Summary:
f857864410 SHERLOCK: Disable the unneeded warning for loadSound()
ed52070aa5 SHERLOCK: Implement the cmdSetNPCDescOnOff opcode for Rose Tattoo


Commit: f857864410b14ed175cf96871146c2072401ce47
    https://github.com/scummvm/scummvm/commit/f857864410b14ed175cf96871146c2072401ce47
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-11T23:31:28+03:00

Commit Message:
SHERLOCK: Disable the unneeded warning for loadSound()

Changed paths:
    engines/sherlock/sound.cpp



diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 16e9b29..7ff1ead 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -96,7 +96,7 @@ void Sound::syncSoundSettings() {
 
 void Sound::loadSound(const Common::String &name, int priority) {
 	// No implementation required in ScummVM
-	warning("loadSound");
+	//warning("loadSound");
 }
 
 byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {


Commit: ed52070aa502efd4f5999c1857570f5605f0bf2b
    https://github.com/scummvm/scummvm/commit/ed52070aa502efd4f5999c1857570f5605f0bf2b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-11T23:31:28+03:00

Commit Message:
SHERLOCK: Implement the cmdSetNPCDescOnOff opcode for Rose Tattoo

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 b84cebe..148a10a 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -293,7 +293,27 @@ OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) { error("TODO: script
 OpcodeReturn TattooTalk::cmdPassword(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) { error("TODO: script opcode"); }
+
+OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) {
+	int npcNum = *++str;
+	++str;
+	People &people = *_vm->_people;
+	Person &person = people[npcNum];
+
+	// 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)
+		person._examine += *str++;
+
+	// Move past any leftover text till we reach a stop marker
+	while (*str && *str != 208)
+		str++;
+
+	if (!*str)
+		str--;
+
+	return RET_SUCCESS;
+}
 
 OpcodeReturn TattooTalk::cmdSetNPCInfoLine(const byte *&str) {
 	int npcNum = *++str;