diff options
author | Paul Gilbert | 2015-06-01 22:24:42 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-01 22:24:42 -0400 |
commit | 39c4a3d4c10b870c329e15391a846fe4188f55bd (patch) | |
tree | f98a1cf02e634547bf639975d394e9775cff8404 /engines/sherlock/talk.cpp | |
parent | df665e5907735fd5d40dcacd040f2e33b5125220 (diff) | |
download | scummvm-rg350-39c4a3d4c10b870c329e15391a846fe4188f55bd.tar.gz scummvm-rg350-39c4a3d4c10b870c329e15391a846fe4188f55bd.tar.bz2 scummvm-rg350-39c4a3d4c10b870c329e15391a846fe4188f55bd.zip |
SHERLOCK: Add extra constructor field initializations
Diffstat (limited to 'engines/sherlock/talk.cpp')
-rw-r--r-- | engines/sherlock/talk.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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; } |