diff options
| author | Paul Gilbert | 2015-08-17 20:21:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-17 20:21:14 -0400 |
| commit | 21666d701e79dd83411a0ba19e00642a5c51e377 (patch) | |
| tree | 461d321b0ba88a8e1f60eb933f0b242b242f6b1a /engines/sherlock/tattoo | |
| parent | d3b8152a714d8ec4a573d51bc844a129c80b533c (diff) | |
| download | scummvm-rg350-21666d701e79dd83411a0ba19e00642a5c51e377.tar.gz scummvm-rg350-21666d701e79dd83411a0ba19e00642a5c51e377.tar.bz2 scummvm-rg350-21666d701e79dd83411a0ba19e00642a5c51e377.zip | |
SHERLOCK: Rename talk to initTalk
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_verbs.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index 68bc29bd12..9a3eb4e4d1 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -477,7 +477,7 @@ void TattooUserInterface::doStandardControl() { _menuMode = VERB_MODE; } else if (_personFound || (_bgFound != -1 && _bgFound < 1000 && _bgShape->_aType == PERSON)) { // The object found is a person (the default for people is TALK) - talk.talk(_bgFound); + talk.initTalk(_bgFound); _activeObj = -1; } else if (!noDesc) { // Either call the code to Look at it's Examine Field or call the Exit animation diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp index 0d83cde6c7..975d540053 100644 --- a/engines/sherlock/tattoo/widget_verbs.cpp +++ b/engines/sherlock/tattoo/widget_verbs.cpp @@ -225,7 +225,7 @@ void WidgetVerbs::handleEvents() { } else if (!_verbCommands[_selector].compareToIgnoreCase(strTalk)) { // Talk command is being activated - talk.talk(ui._activeObj); + talk.initTalk(ui._activeObj); ui._activeObj = -1; } else if (!_verbCommands[_selector].compareToIgnoreCase(strJournal)) { |