SHERLOCK: Add extra constructor field initializations

3 files changed, 9 insertions, 2 deletions

diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 7686d52572..c9d3b795e8 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -71,6 +71,7 @@ const char *const WALK_LIB_NAMES[10] = {
 Person::Person() : Sprite(), _walkLoaded(false), _npcIndex(0), _npcStack(0), _npcPause(false)  {
 	Common::fill(&_npcPath[0], &_npcPath[MAX_NPC_PATH], 0);
 	_tempX = _tempScaleVal = 0;
+	_updateNPCPath = false;
 }
 
 void Person::clearNPC() {
diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index 50021dd057..072b10f7eb 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -156,11 +156,13 @@ ScalpelEngine *Object::_vm;
 
 Object::Object() {
 	_vm = nullptr;
-	_isAnimating = false;
+	_isAnimating = _finished = false;
 	_frame = 0;
 	_numFrames = 0;
 	_frameChange = 0;
 	_angle = _changeCtr = 0;
+	_walkStartFrame = 0;
+	_majorDiff = _minorDiff = 0;
 }
 
 void Object::setVisage(int visage, int strip) {
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 59897e2c2a..319cb10850 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -252,7 +252,8 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_moreTalkDown = _moreTalkUp = false;
 	_scriptMoreFlag = 0;
 	_scriptSaveIndex = -1;
-	_opcodes = IS_SERRATED_SCALPEL ? SCALPEL_OPCODES : TATTOO_OPCODES;
+	_opcodes = nullptr;
+	_opcodeTable = nullptr;
 
 	_charCount = 0;
 	_line = 0;
@@ -261,6 +262,7 @@ Talk::Talk(SherlockEngine *vm) : _vm(vm) {
 	_pauseFlag = false;
 	_seqCount = 0;
 	_scriptStart = _scriptEnd = nullptr;
+	_endStr = _noTextYet = false;
 }
 
 void Talk::talkTo(const Common::String &filename) {
@@ -1808,6 +1810,7 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 	};
 
+	_opcodes = SCALPEL_OPCODES;
 	_opcodeTable = OPCODE_METHODS;
 }
 
@@ -2056,6 +2059,7 @@ TattooTalk::TattooTalk(SherlockEngine *vm) : Talk(vm) {
 		(OpcodeMethod)&TattooTalk::cmdTurnSoundsOff
 	};
 
+	_opcodes = TATTOO_OPCODES;
 	_opcodeTable = OPCODE_METHODS;
 }