libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SHERLOCK: Rename talk to initTalk

Browse Source
This commit is contained in:
Paul Gilbert 2015-08-17 20:21:14 -04:00
parent d3b8152a71
commit 21666d701e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sherlock/scalpel/scalpel_user_interface.cpp
View File

@ -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)

2
engines/sherlock/talk.cpp
View File

@ -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;

2
engines/sherlock/talk.h
View File

@ -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

2
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -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

2
engines/sherlock/tattoo/widget_verbs.cpp
View File

@ -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)) {