[Scummvm-cvs-logs] scummvm master -> 21666d701e79dd83411a0ba19e00642a5c51e377

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
21666d701e SHERLOCK: Rename talk to initTalk


Commit: 21666d701e79dd83411a0ba19e00642a5c51e377
    https://github.com/scummvm/scummvm/commit/21666d701e79dd83411a0ba19e00642a5c51e377
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-17T20:21:14-04:00

Commit Message:
SHERLOCK: Rename talk to initTalk

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp
    engines/sherlock/talk.cpp
    engines/sherlock/talk.h
    engines/sherlock/tattoo/tattoo_user_interface.cpp
    engines/sherlock/tattoo/widget_verbs.cpp



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index f948b78..a67d464 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 7ecf62c..efe0ecc 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 8352435..7d40c22 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 68bc29b..9a3eb4e 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 0d83cde..975d540 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)) {