Wrap up talk_taber2()

svn-id: r32384

3 files changed, 26 insertions, 23 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 32e4e54d0e..80a3ab2f59 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -2497,36 +2497,36 @@ void DrasculaEngine::animation_10_6() {
 	copyBackground(164, 85, 155, 48, 113, 114, drawSurface3, screenSurface);
 	updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
 	stopSound();
-	talk_taber2(_textt[_lang][23], "t23.als");
+	talk_taber2(23);
 	flags[7] = 1;
 }
 
 void DrasculaEngine::animation_11_6() {
-	talk_taber2(_textt[_lang][10], "t10.als");
+	talk_taber2(10);
 	talk(268);
-	talk_taber2(_textt[_lang][11], "t11.als");
+	talk_taber2(11);
 }
 
 void DrasculaEngine::animation_12_6() {
-	talk_taber2(_textt[_lang][12], "t12.als");
+	talk_taber2(12);
 	talk(270);
-	talk_taber2(_textt[_lang][13], "t13.als");
-	talk_taber2(_textt[_lang][14], "t14.als");
+	talk_taber2(13);
+	talk_taber2(14);
 }
 
 void DrasculaEngine::animation_13_6() {
-	talk_taber2(_textt[_lang][15], "t15.als");
+	talk_taber2(15);
 }
 
 void DrasculaEngine::animation_14_6() {
-	talk_taber2(_textt[_lang][24], "t24.als");
+	talk_taber2(24);
 	addObject(21);
 	flags[10] = 1;
 	rompo_y_salgo = 1;
 }
 
 void DrasculaEngine::animation_15_6() {
-	talk_taber2(_textt[_lang][16], "t16.als");
+	talk_taber2(16);
 }
 
 void DrasculaEngine::animation_18_6() {
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index adddf43de6..79ea71369e 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -484,6 +484,7 @@ public:
 	void placeIgor();
 	void placeBJ();
 	void placeDrascula();
+
 	void talkInit(const char *filename);
 	void talk_igor_dch(int);
 	void talk_igor_dch(const char *said, const char *filename);
@@ -497,14 +498,27 @@ public:
 	void talk_tabernero(const char *said, const char *filename);
 	void talk_igorpuerta(const char *said, const char *filename);
 	void talk_igor_peluca(const char *said, const char *filename);
-	void hiccup(int);
-	void stopSound();
+	void talk_pen(const char *, const char *);
+	void talk_pen2(const char *, const char *);
+	void talk_taber2(int);
+	void talk_taber2(const char *, const char *);
+	void talk_bj_bed(int);
+	void talk_bj_bed(const char *said, const char * filename);
+	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 *);
 	void talk_sinc(const char *, const char *, const char *);
+	void talk_drunk(const char *said, const char *filename);
+	void talk_pianista(const char *said, const char *filename);
+	void talk_igor_seated(const char *, const char *);
+	void talk_wolf(const char *said, const char *filename);
+	void talk_mus(const char *said, const char *filename);
+
+	void hiccup(int);
+	void stopSound();
 	void closeDoor(int nflag, int doorNum);
 	void playMusic(int p);
 	void stopMusic();
@@ -612,8 +626,6 @@ public:
 	void converse(const char *);
 	void print_abc_opc(const char *, int, int, int);
 	void response(int);
-	void talk_drunk(const char *said, const char *filename);
-	void talk_pianista(const char *said, const char *filename);
 
 	void MusicFadeout();
 	void ctvd_end();
@@ -670,9 +682,6 @@ public:
 	void update_56_pre();
 	void update_50();
 	void update_57();
-	void talk_igor_seated(const char *, const char *);
-	void talk_wolf(const char *said, const char *filename);
-	void talk_mus(const char *said, const char *filename);
 	void room_58(int);
 	void room_59(int);
 	bool room_60(int);
@@ -702,12 +711,6 @@ public:
 	void animation_18_6();
 	void animation_19_6();
 	void activatePendulum();
-	void talk_pen(const char *, const char *);
-	void talk_pen2(const char *, const char *);
-	void talk_taber2(const char *, const char *);
-	void talk_bj_bed(int);
-	void talk_bj_bed(const char *said, const char * filename);
-	void talk_htel(const char *said, const char *filename);
 
 private:
 	int _lang;
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index dd34716a06..239fed568d 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -1218,7 +1218,7 @@ bool DrasculaEngine::room_60(int fl) {
 		talk(440);
 	else if (pickedObject == kVerbTalk && fl == 52) {
 		talk(266);
-		talk_taber2(_textt[_lang][1], "t1.als");
+		talk_taber2(1);
 		converse("op_12.cal");
 		withoutVerb();
 		pickedObject = 0;