- Make Cutaway use Walk object from Logic

- Added talkSpeed to Logic
- Some more Talk code

svn-id: r10810

1 files changed, 5 insertions, 2 deletions

diff --git a/queen/talk.h b/queen/talk.h
index 7ec2f9c7c0..a1fae9290d 100644
--- a/queen/talk.h
+++ b/queen/talk.h
@@ -36,7 +36,8 @@ class Talk {
 	//! Public interface to run a talk from a file
 	static void talk(
 		const char *filename,
-		char *cutawayFilename,
+		int personInRoom,
+		char *cutawayFilename, 
 		Graphics *graphics,
 		Logic *logic,
 		Resource *resource);
@@ -140,7 +141,7 @@ class Talk {
 	~Talk();
 
 	//! Perform talk in file and return a cutaway filename
-	void talk(const char *filename, char *cutawayFilename);
+	void talk(const char *filename, int personInRoom, char *cutawayFilename);
 
 	//! Load talk data from .dog file 
 	void load(const char *filename);
@@ -175,6 +176,8 @@ class Talk {
 		const char *voiceFilePrefix,
 		int index);
 
+	int countSpaces(const char *segment);
+
 	static int splitOption(const char *str, char optionText[5][MAX_STRING_SIZE]);