aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-06 20:46:03 -0400
committerPaul Gilbert2015-05-06 20:46:03 -0400
commitd8673cfe44126f1d24ec0cff82a3407e9f891d7b (patch)
treedc9498785b78fa0e8a2e93209f6f424579cb1707 /engines
parent0c12b85d4b67b022b227774db0cd531cf20d528e (diff)
downloadscummvm-rg350-d8673cfe44126f1d24ec0cff82a3407e9f891d7b.tar.gz
scummvm-rg350-d8673cfe44126f1d24ec0cff82a3407e9f891d7b.tar.bz2
scummvm-rg350-d8673cfe44126f1d24ec0cff82a3407e9f891d7b.zip
SHERLOCK: Dropped _saveSeqNum in favor of _savedSequences size
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/talk.cpp3
-rw-r--r--engines/sherlock/talk.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 11385ca978..b1f4d4e546 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -94,7 +94,6 @@ void TalkSequences::clear() {
Talk::Talk(SherlockEngine *vm): _vm(vm) {
_talkCounter = 0;
_talkToAbort = false;
- _saveSeqNum = 0;
_speaker = 0;
_talkIndex = 0;
_talkTo = 0;
@@ -1008,7 +1007,7 @@ void Talk::doScript(const Common::String &script) {
int obj;
int seqCount;
- _saveSeqNum = 0;
+ _savedSequences.clear();
const byte *scriptStart = (const byte *)script.c_str();
const byte *str = scriptStart;
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index f96c3176d2..b44bccaab6 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -129,7 +129,6 @@ private:
Common::Array<TalkSequences> TALK_SEQUENCES;
private:
SherlockEngine *_vm;
- int _saveSeqNum;
Common::Stack<SequenceEntry> _savedSequences;
Common::Stack<SequenceEntry> _sequenceStack;
Common::Stack<ScriptStackEntry> _scriptStack;