From db0af96fa05b943fccff4c3a88426aab8d22736a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 30 May 2008 10:31:47 +0000 Subject: Wrapped up talk_igor_front, talk_igor_door, talk_igor_seated and talk_igor_wig svn-id: r32392 --- engines/drascula/animation.cpp | 34 +++++++++++++++++----------------- engines/drascula/drascula.h | 4 ++++ engines/drascula/rooms.cpp | 6 +++--- engines/drascula/talk.cpp | 24 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index b4be383e49..57cf549f49 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -378,7 +378,7 @@ void DrasculaEngine::animation_1_1() { pause(18); if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE)) break; - talk_igor_front(_texti[_lang][6], "I6.als"); + talk_igor_front(6); if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE)) break; fadeToBlack(0); @@ -1533,26 +1533,26 @@ void DrasculaEngine::animation_rayo() { } void DrasculaEngine::animation_2_4() { - talk_igor_seated(_texti[_lang][16], "I16.als"); + talk_igor_seated(16); talk(278); - talk_igor_seated(_texti[_lang][17], "I17.als"); + talk_igor_seated(17); talk(279); - talk_igor_seated(_texti[_lang][18], "I18.als"); + talk_igor_seated(18); } void DrasculaEngine::animation_3_4() { - talk_igor_seated(_texti[_lang][19], "I19.als"); - talk_igor_seated(_texti[_lang][20], "I20.als"); + talk_igor_seated(19); + talk_igor_seated(20); talk(281); } void DrasculaEngine::animation_4_4() { talk(287); - talk_igor_seated(_texti[_lang][21], "I21.als"); + talk_igor_seated(21); talk(284); - talk_igor_seated(_texti[_lang][22], "I22.als"); + talk_igor_seated(22); talk(285); - talk_igor_seated(_texti[_lang][23], "I23.als"); + talk_igor_seated(23); } void DrasculaEngine::animation_7_4() { @@ -2032,7 +2032,7 @@ void DrasculaEngine::animation_1_6() { talk_igor_dch(11); sentido_igor = 3; talk_dr_dch(33); - talk_igor_front(_texti[_lang][12], "I12.als"); + talk_igor_front(12); talk_dr_dch(34); sentido_dr = 0; talk_dr_izq(35); @@ -2800,9 +2800,9 @@ void DrasculaEngine::animation_1_4() { flags[18] = 1; flags[20] = 1; - talk_igor_seated(_texti[_lang][13], "I13.als"); - talk_igor_seated(_texti[_lang][14], "I14.als"); - talk_igor_seated(_texti[_lang][15], "I15.als"); + talk_igor_seated(13); + talk_igor_seated(14); + talk_igor_seated(15); flags[21] = 1; } else { talk(356); @@ -2825,7 +2825,7 @@ void DrasculaEngine::animation_1_4() { talk(276); pause(14); - talk_igor_seated(_texti[_lang][6], "I6.als"); + talk_igor_seated(6); } converse("op_6.cal"); @@ -2854,8 +2854,8 @@ void DrasculaEngine::animation_5_4(){ decompressPic(frontSurface, 1); x_igor = 100; y_igor = 65; - talk_igor_front(_texti[_lang][29], "I29.ALS"); - talk_igor_front(_texti[_lang][30], "I30.als"); + talk_igor_front(29); + talk_igor_front(30); loadPic("96.alg"); decompressPic(frontSurface, 1); loadPic("99.alg"); @@ -2883,7 +2883,7 @@ void DrasculaEngine::animation_6_4() { placeIgor(); updateScreen(0, 0, 0, 0, 320, 200, screenSurface); pause(40); - talk_igor_front(_texti[_lang][26], "I26.als"); + talk_igor_front(26); roomNumber = prevRoom; clearRoom(); loadPic("96.alg"); diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index f6696ff820..22610accd0 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -488,10 +488,13 @@ public: void talk_dr_izq(int); void talk_dr_izq(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_tabernero(int); void talk_tabernero(const char *said, const char *filename); + void talk_igor_door(int); void talk_igor_door(const char *said, const char *filename); + void talk_igor_wig(int); void talk_igor_wig(const char *said, const char *filename); void talk_pen(const char *, const char *); void talk_pen2(const char *, const char *); @@ -508,6 +511,7 @@ public: 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(int); 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); diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index f7c6eacca4..893cd4bfae 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -832,16 +832,16 @@ void DrasculaEngine::room_26(int fl) { flags[12] = 1; closeDoor(2, 0); sentido_hare = 2; - talk_igor_door(_texti[_lang][27], "I27.als"); + talk_igor_door(27); flags[30] = 1; - talk_igor_door(_texti[_lang][28], "I28.als"); + talk_igor_door(28); lleva_al_hare(153, 180); } else if (pickedObject == kVerbPick && fl == 143 && flags[18] == 0) { lleva_al_hare(260, 180); copyBackground(80, 78, 199, 94, 38, 27, drawSurface3, screenSurface); updateScreen(199, 94, 199, 94, 38, 27, screenSurface); pause(3); - talk_igor_wig(_texti[_lang][25], "I25.als"); + talk_igor_wig(25); lleva_al_hare(153, 180); } else if (pickedObject == kVerbTalk && fl == 51) animation_1_4(); diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index c4e208b7df..3a5820c241 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -284,6 +284,12 @@ bucless: } } +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) { int x_talk[8] = { 56, 86, 116, 146, 176, 206, 236, 266 }; int face; @@ -1447,6 +1453,12 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, screenSurface); } +void DrasculaEngine::talk_igor_door(int index) { + char name[20]; + sprintf(name, "I%i.als", index); + talk_igor_door(_texti[_lang][index], name); +} + void DrasculaEngine::talk_igor_door(const char *said, const char *filename) { int length = strlen(said); @@ -1480,6 +1492,12 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, screenSurface); } +void DrasculaEngine::talk_igor_seated(int index) { + char name[20]; + sprintf(name, "I%i.als", index); + talk_igor_seated(_texti[_lang][index], name); +} + void DrasculaEngine::talk_igor_seated(const char *said, const char *filename) { int x_talk[4] = { 80, 102, 124, 146 }; int face; @@ -1527,6 +1545,12 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, screenSurface); } +void DrasculaEngine::talk_igor_wig(int index) { + char name[20]; + sprintf(name, "I%i.als", index); + talk_igor_wig(_texti[_lang][index], name); +} + void DrasculaEngine::talk_igor_wig(const char *said, const char *filename) { int x_talk[4] = {119, 158, 197, 236}; int face = 0; -- cgit v1.2.3