Removed some of the old talk functions

svn-id: r32487

3 files changed, 22 insertions, 30 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index a17afbe540..b19aec0fae 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -2262,7 +2262,7 @@ void DrasculaEngine::animation_11_2() {
 	talk_bartender(18);
 	talk(355);
 	pause(40);
-	talk_bartender("No, nada", "d82.als");
+	talk_bartender(82);
 
 	if (_lang == kSpanish)
 		textSurface = extraSurface;
@@ -2405,7 +2405,7 @@ void DrasculaEngine::animation_36_2() {
 	talk_bartender(21);
 	talk(355);
 	pause(40);
-	talk_bartender("No, nada", "d82.als");
+	talk_bartender(82);
 
 	if (_lang == kSpanish)
 		textSurface = extraSurface;
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index f459e559fe..cca8f50be0 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -425,14 +425,10 @@ public:
 	void talkInit(const char *filename);
 	bool isTalkFinished(int* length);
 	void talk_igor_dch(int);
-	void talk_igor_dch(const char *said, const char *filename);
 	void talk_drascula(int index, int talkerType = 0);
-	void talk_drascula(const char *said, const char *filename);
 	void talk_solo(const char *, const char *);
 	void talk_igor_front(int);
-	void talk_igor_front(const char *, const char *);
 	void talk_bartender(int, int talkerType = 0);
-	void talk_bartender(const char *said, const char *filename, int talkerType = 0);
 	void talk_igor_door(int);
 	void talk_igor_door(const char *said, const char *filename);
 	void talk_igor_wig(int);
@@ -443,7 +439,6 @@ public:
 	void talk_htel(int);
 	void talk_htel(const char *said, const char *filename);
 	void talk_bj(int);
-	void talk_bj(const char *, const char *);
 	void talk_baul(const char *said, const char *filename);
 	void talk(int);
 	void talk(const char *, const char *);
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 62bedc2fd1..88312d9af3 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -51,12 +51,9 @@ bool DrasculaEngine::isTalkFinished(int* length) {
 }
 
 void DrasculaEngine::talk_igor_dch(int index) {
-	char name[20];
-	sprintf(name, "I%i.als", index);
-	talk_igor_dch(_texti[_lang][index], name);
-}
-
-void DrasculaEngine::talk_igor_dch(const char *said, const char *filename) {
+	char filename[20];
+	sprintf(filename, "I%i.als", index);
+	const char *said = _texti[_lang][index];
 	int x_talk[8] = { 56, 82, 108, 134, 160, 186, 212, 238 };
 	int face;
 	int length = strlen(said);
@@ -185,12 +182,9 @@ void DrasculaEngine::talk_solo(const char *said, const char *filename) {
 }
 
 void DrasculaEngine::talk_igor_front(int index) {
-	char name[20];
-	sprintf(name, "I%i.als", index);
-	talk_igor_front(_texti[_lang][index], name);
-}
-
-void DrasculaEngine::talk_igor_front(const char *said, const char *filename) {
+	char filename[20];
+	sprintf(filename, "I%i.als", index);
+	const char *said = _texti[_lang][index];
 	int x_talk[8] = { 56, 86, 116, 146, 176, 206, 236, 266 };
 	int face;
 	int length = strlen(said);
@@ -237,12 +231,18 @@ void DrasculaEngine::talk_igor_front(const char *said, const char *filename) {
 }
 
 void DrasculaEngine::talk_bartender(int index, int talkerType) {
-	char name[20];
-	sprintf(name, "t%i.als", index);
-	talk_bartender(_textt[_lang][index], name);
-}
+	char filename[20];
+	sprintf(filename, "t%i.als", index);
+	char specialLine[20];
+	sprintf(specialLine, "No, nada");
+	const char *said;
+
+	// Line 82 is hardcoded
+	if (index != 82)
+		said = _textt[_lang][index];
+	else
+		said = (const char*)specialLine;
 
-void DrasculaEngine::talk_bartender(const char *said, const char *filename, int talkerType) {
 	int x_talk[9] = { 1, 23, 45, 67, 89, 111, 133, 155, 177 };
 	int face;
 	int length = strlen(said);
@@ -290,12 +290,9 @@ void DrasculaEngine::talk_bartender(const char *said, const char *filename, int
 }
 
 void DrasculaEngine::talk_bj(int index) {
-	char name[20];
-	sprintf(name, "BJ%i.als", index);
-	talk_bj(_textbj[_lang][index], name);
-}
-
-void DrasculaEngine::talk_bj(const char *said, const char *filename) {
+	char filename[20];
+	sprintf(filename, "BJ%i.als", index);
+	const char *said = _textbj[_lang][index];
 	int x_talk[5] = { 64, 92, 120, 148, 176 };
 	int face;
 	int length = strlen(said);