diff options
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/talk.h | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_verbs.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index f948b786e7..a67d464a11 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -276,7 +276,7 @@ void ScalpelUserInterface::handleInput() { } if (events._released && personFound) - talk.talk(_bgFound); + talk.initTalk(_bgFound); else if (personFound) lookScreen(pt); else if (_bgFound < 1000) diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 7ecf62cd96..efe0eccf60 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -452,7 +452,7 @@ void Talk::talkTo(const Common::String &filename) { events.setCursor(ARROW); } -void Talk::talk(int objNum) { +void Talk::initTalk(int objNum) { Events &events = *_vm->_events; People &people = *_vm->_people; Scene &scene = *_vm->_scene; diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h index 8352435a09..7d40c2235b 100644 --- a/engines/sherlock/talk.h +++ b/engines/sherlock/talk.h @@ -307,7 +307,7 @@ public: * interface window for the conversation and passes on control to give the * player a list of options to make a selection from */ - void talk(int objNum); + void initTalk(int objNum); /** * Clear loaded talk data 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)) { |