diff options
| author | Paul Gilbert | 2015-08-27 08:28:32 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-27 08:28:32 -0400 |
| commit | 55f9c364bcd717e3ae2b6c2b4effd942c930968e (patch) | |
| tree | bc354270dba46b7c19339f2bf8ef35dc3e83923f | |
| parent | e96a302b74e70b862034cfbfb81af6093094d97d (diff) | |
| download | scummvm-rg350-55f9c364bcd717e3ae2b6c2b4effd942c930968e.tar.gz scummvm-rg350-55f9c364bcd717e3ae2b6c2b4effd942c930968e.tar.bz2 scummvm-rg350-55f9c364bcd717e3ae2b6c2b4effd942c930968e.zip | |
SHERLOCK: RT: Fix talkTo filename getting changed mid-script
Calls to cmdPauseWithoutControl can allow a second script to run,
with it's own filename. This shouldn't change the filename for
the outer call to talkTo
| -rw-r--r-- | engines/sherlock/talk.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/talk.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 010bb3dab8..d0c74f8c4b 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -647,7 +647,7 @@ void Talk::pushSequence(int speaker) { } } -void Talk::doScript(const Common::String &script) { +void Talk::doScript(const Common::String script) { People &people = *_vm->_people; Scene &scene = *_vm->_scene; Screen &screen = *_vm->_screen; diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h index 694ac083b2..b3868d7293 100644 --- a/engines/sherlock/talk.h +++ b/engines/sherlock/talk.h @@ -289,7 +289,7 @@ public: * Parses a reply for control codes and display text. The found text is printed within * the text window, handles delays, animations, and animating portraits. */ - void doScript(const Common::String &script); + void doScript(const Common::String script); /** * Main method for handling conversations when a character to talk to has been |