From dbbfaa4c83fda6a76271099dca8565ef0f6e9904 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 26 Aug 2008 08:35:02 +0000
Subject: talk_dr_grande -> talk_drascula_big talk_baul -> talk_trunk

svn-id: r34182
---
 engines/drascula/animation.cpp |  2 +-
 engines/drascula/drascula.h    |  4 +--
 engines/drascula/rooms.cpp     |  2 +-
 engines/drascula/talk.cpp      | 72 +++++++++++++++++++++---------------------
 4 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'engines')

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index cbd22a876d..a26f00f3a0 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -177,7 +177,7 @@ void DrasculaEngine::animation_1_1() {
 			break;
 		copyBackground(0, 0, 0, 0, 320, 200, screenSurface, bgSurface);
 
-		talk_dr_grande(1);
+		talk_drascula_big(1);
 		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
 			break;
 
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index e81d2a4114..2eb7a19559 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -427,7 +427,7 @@ public:
 	void talk_bj_bed(int);
 	void talk_htel(int);
 	void talk_bj(int);
-	void talk_baul(int);
+	void talk_trunk(int);
 	void talk(int);
 	void talk(const char *, const char *);
 	void talk_sync(const char *, const char *, const char *);
@@ -435,7 +435,7 @@ public:
 	void talk_pianist(int);
 	void talk_werewolf(int);
 	void talk_mus(int);
-	void talk_dr_grande(int);
+	void talk_drascula_big(int);
 	void talk_vonBraun(int, int);
 	void talk_blind(int);
 	void talk_hacker(int);
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 7d645f01f7..0693b342da 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -440,7 +440,7 @@ bool DrasculaEngine::room_16(int fl) {
 		pause(10);
 		talk_sync(_text[_lang][50], "50.als", "11111111111144432554433");
 		pause(3);
-		talk_baul(83);
+		talk_trunk(83);
 	} else if (pickedObject == kVerbOpen && fl == 183) {
 		openDoor(19, NO_DOOR);
 		if (flags[20] == 0) {
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index dab5e4c4cd..5ee7f13a25 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -193,6 +193,41 @@ void DrasculaEngine::talk_drascula(int index, int talkerType) {
 	updateScreen();
 }
 
+void DrasculaEngine::talk_drascula_big(int index) {
+	char filename[20];
+	sprintf(filename, "d%i.als", index);
+	const char *said = _textd[_lang][index];
+	int x_talk[4] = {47, 93, 139, 185};
+	int face;
+	int l = 0;
+	int length = strlen(said);
+
+	color_abc(kColorRed);
+
+	talkInit(filename);
+
+	do {
+		face = _rnd->getRandomNumber(3);
+		copyBackground();
+		copyBackground(interf_x[l] + 24, interf_y[l], 0, 45, 39, 31, drawSurface2, screenSurface);
+		copyBackground(x_talk[face], 1, 171, 68, 45, 48, drawSurface2, screenSurface);
+		l++;
+		if (l == 7)
+			l = 0;
+
+		if (withVoices == 0)
+			centerText(said, 191, 69);
+
+		updateScreen();
+
+		pause(3);
+
+		byte key = getScan();
+		if (key == Common::KEYCODE_ESCAPE)
+			term_int = 1;
+	} while (!isTalkFinished(&length));
+}
+
 void DrasculaEngine::talk_solo(const char *said, const char *filename) {
 	int length = strlen(said);
 
@@ -857,7 +892,7 @@ void DrasculaEngine::talk_sync(const char *said, const char *filename, const cha
 		playMusic(roomMusic);
 }
 
-void DrasculaEngine::talk_baul(int index) {
+void DrasculaEngine::talk_trunk(int index) {
 	char filename[20];
 	sprintf(filename, "d%i.als", index);
 	const char *said = _text[_lang][index];
@@ -889,41 +924,6 @@ void DrasculaEngine::talk_baul(int index) {
 	updateScreen();
 }
 
-void DrasculaEngine::talk_dr_grande(int index) {
-	char filename[20];
-	sprintf(filename, "D%i.als", index);
-	const char *said = _textd[_lang][index];
-	int x_talk[4] = {47, 93, 139, 185};
-	int face;
-	int l = 0;
-	int length = strlen(said);
-
-	color_abc(kColorRed);
-
-	talkInit(filename);
-
-	do {
-		face = _rnd->getRandomNumber(3);
-		copyBackground();
-		copyBackground(interf_x[l] + 24, interf_y[l], 0, 45, 39, 31, drawSurface2, screenSurface);
-		copyBackground(x_talk[face], 1, 171, 68, 45, 48, drawSurface2, screenSurface);
-		l++;
-		if (l == 7)
-			l = 0;
-
-		if (withVoices == 0)
-			centerText(said, 191, 69);
-
-		updateScreen();
-
-		pause(3);
-
-		byte key = getScan();
-		if (key == Common::KEYCODE_ESCAPE)
-			term_int = 1;
-	} while (!isTalkFinished(&length));
-}
-
 void DrasculaEngine::talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords, byte* surface) {
 	int face;
 	int length = strlen(said);
-- 
cgit v1.2.3