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

[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:
fda0d009ae SHERLOCK: Implement cmdSetNPCOn and cmdSetNPCOff script commands


Commit: fda0d009ae55705b48d3965fdb9283f4396d7b07
    https://github.com/scummvm/scummvm/commit/fda0d009ae55705b48d3965fdb9283f4396d7b07
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-06T11:03:21-04:00

Commit Message:
SHERLOCK: Implement cmdSetNPCOn and cmdSetNPCOff script commands

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 d95b5ca..0ac02d5 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -211,8 +211,23 @@ OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { error("TODO: script opc
 OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCDescOnOff(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCInfoLine(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetNPCOff(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { error("TODO: script opcode"); }
+
+OpcodeReturn TattooTalk::cmdSetNPCOff(const byte *&str) {
+	People &people = *_vm->_people;
+	int npcNum = *++str;
+	people[npcNum]._type = REMOVE;
+
+	return RET_SUCCESS;
+}
+
+OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { 
+	People &people = *_vm->_people;
+	int npcNum = *++str;
+	people[npcNum]._type = CHARACTER;
+
+	return RET_SUCCESS;
+}
+
 OpcodeReturn TattooTalk::cmdSetNPCPathDest(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCPathPause(const byte *&str) { error("TODO: script opcode"); }
 OpcodeReturn TattooTalk::cmdSetNPCPathPauseTakingNotes(const byte *&str) { error("TODO: script opcode"); }