[Scummvm-cvs-logs] SF.net SVN: scummvm: [32383] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri May 30 10:48:03 CEST 2008
Revision: 32383
http://scummvm.svn.sourceforge.net/scummvm/?rev=32383&view=rev
Author: sev
Date: 2008-05-30 01:48:01 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Wrap up rest of talk() calls
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/rooms.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 08:30:40 UTC (rev 32382)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 08:48:01 UTC (rev 32383)
@@ -695,7 +695,7 @@
loadPic("an12.alg");
decompressPic(extraSurface, 1);
- talk(_text[_lang][205],"205.als");
+ talk(205;
updateRefresh_pre();
@@ -716,13 +716,13 @@
flags[11] = 1;
talk_pianista(_textp[_lang][1], "p1.als");
- talk(_text[_lang][206], "206.als");
+ talk(206);
talk_pianista(_textp[_lang][2], "p2.als");
- talk(_text[_lang][207], "207.als");
+ talk(207);
talk_pianista(_textp[_lang][3], "p3.als");
- talk(_text[_lang][208], "208.als");
+ talk(208);
talk_pianista(_textp[_lang][4], "p4.als");
- talk(_text[_lang][209], "209.als");
+ talk(209);
if (_lang == kSpanish)
textSurface = extraSurface;
@@ -834,7 +834,7 @@
flags[9] = 1;
pause(12);
- talk(_textd[_lang][56], "d56.als");
+ talk([56);
pause(8);
clearRoom();
@@ -911,7 +911,7 @@
void DrasculaEngine::animation_8_2() {
talk_pianista(_textp[_lang][6], "P6.als");
- talk(_text[_lang][358], "358.als");
+ talk(358);
talk_pianista(_textp[_lang][7], "P7.als");
talk_pianista(_textp[_lang][8], "P8.als");
}
@@ -924,14 +924,14 @@
void DrasculaEngine::animation_10_2() {
talk_pianista(_textp[_lang][12], "P12.als");
- talk(_text[_lang][361], "361.als");
+ talk(361);
pause(40);
talk_pianista(_textp[_lang][13], "P13.als");
- talk(_text[_lang][362], "362.als");
+ talk(362);
talk_pianista(_textp[_lang][14], "P14.als");
- talk(_text[_lang][363], "363.als");
+ talk(363);
talk_pianista(_textp[_lang][15], "P15.als");
- talk(_text[_lang][364], "364.als");
+ talk(364);
talk_pianista(_textp[_lang][16], "P16.als");
}
@@ -987,7 +987,7 @@
int l;
talk_drunk(_textb[_lang][12], "B12.als");
- talk(_text[_lang][371], "371.als");
+ talk(371);
clearRoom();
@@ -1504,10 +1504,10 @@
}
void DrasculaEngine::animation_1_3() {
- talk(_text[_lang][413], "413.als");
+ talk(413);
grr();
pause(50);
- talk(_text[_lang][414], "414.als");
+ talk(414);
}
void DrasculaEngine::animation_2_3() {
@@ -1826,30 +1826,30 @@
void DrasculaEngine::animation_2_4() {
talk_igor_seated(_texti[_lang][16], "I16.als");
- talk(_text[_lang][278], "278.als");
+ talk(278);
talk_igor_seated(_texti[_lang][17], "I17.als");
- talk(_text[_lang][279], "279.als");
+ talk(279);
talk_igor_seated(_texti[_lang][18], "I18.als");
}
void DrasculaEngine::animation_3_4() {
talk_igor_seated(_texti[_lang][19], "I19.als");
talk_igor_seated(_texti[_lang][20], "I20.als");
- talk(_text[_lang][281], "281.als");
+ talk(281);
}
void DrasculaEngine::animation_4_4() {
- talk(_text[_lang][287], "287.als");
+ talk(287);
talk_igor_seated(_texti[_lang][21], "I21.als");
- talk(_text[_lang][284], "284.als");
+ talk(284);
talk_igor_seated(_texti[_lang][22], "I22.als");
- talk(_text[_lang][285], "285.als");
+ talk(285);
talk_igor_seated(_texti[_lang][23], "I23.als");
}
void DrasculaEngine::animation_7_4() {
black();
- talk(_text[_lang][427], "427.als");
+ talk(427);
fadeFromBlack(1);
removeObject(8);
removeObject(10);
@@ -1862,7 +1862,7 @@
void DrasculaEngine::animation_1_5() {
if (flags[0] == 0) {
- talk(_text[_lang][430], "430.als");
+ talk(430);
talk_bj(16);
talk_bj(17);
talk_bj(18);
@@ -1914,20 +1914,20 @@
flags[7] = 1;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
- talk(_text[_lang][228], "228.als");
+ talk(228);
talk_wolf(_textl[_lang][1], "L1.als");
talk_wolf(_textl[_lang][2], "L2.als");
pause(23);
- talk(_text[_lang][229], "229.als");
+ talk(229);
talk_wolf(_textl[_lang][3], "L3.als");
talk_wolf(_textl[_lang][4], "L4.als");
- talk(_text[_lang][230], "230.als");
+ talk(230);
talk_wolf(_textl[_lang][5], "L5.als");
- talk(_text[_lang][231], "231.als");
+ talk(231);
talk_wolf(_textl[_lang][6], "L6.als");
talk_wolf(_textl[_lang][7], "L7.als");
pause(33);
- talk(_text[_lang][232], "232.als");
+ talk(232);
talk_wolf(_textl[_lang][8], "L8.als");
}
@@ -2017,12 +2017,12 @@
void DrasculaEngine::animation_6_5() {
talk_wolf(_textl[_lang][9], "L9.als");
- talk(_text[_lang][234], "234.als");
+ talk(234);
}
void DrasculaEngine::animation_7_5() {
talk_wolf(_textl[_lang][10], "L10.als");
- talk(_text[_lang][236], "236.als");
+ talk(236);
talk_wolf(_textl[_lang][11], "L11.als");
talk_wolf(_textl[_lang][12], "L12.als");
talk_wolf(_textl[_lang][13], "L13.als");
@@ -2032,20 +2032,20 @@
void DrasculaEngine::animation_8_5() {
talk_wolf(_textl[_lang][15], "L15.als");
- talk(_text[_lang][238], "238.als");
+ talk(238);
talk_wolf(_textl[_lang][16], "L16.als");
}
void DrasculaEngine::animation_9_5() {
flags[4] = 1;
- talk(_text[_lang][401], "401.als");
+ talk(401);
withoutVerb();
removeObject(15);
}
void DrasculaEngine::animation_10_5() {
flags[3] = 1;
- talk(_text[_lang][401], "401.als");
+ talk(401);
withoutVerb();
removeObject(12);
}
@@ -2056,7 +2056,7 @@
animation_12_5();
else {
flags[9] = 0;
- talk(_text[_lang][33], "33.als");
+ talk(33;
}
}
@@ -2225,7 +2225,7 @@
stopSound();
pause(17);
sentido_hare = 3;
- talk(_text[_lang][246],"246.als");
+ talk(246;
lleva_al_hare(89, 160);
flags[10] = 1;
playSound("s7.als");
@@ -2244,7 +2244,7 @@
talk_mus(_texte[_lang][4], "E4.als");
talk_mus(_texte[_lang][5], "E5.als");
talk_mus(_texte[_lang][6], "E6.als");
- talk(_text[_lang][291], "291.als");
+ talk(291);
talk_mus(_texte[_lang][7], "E7.als");
}
@@ -2458,12 +2458,12 @@
decompressPic(frontSurface, COMPLETE_PAL);
loadPic("nota2.alg");
decompressPic(drawSurface1, HALF_PAL);
- talk(_text[_lang][296], "296.als");
- talk(_text[_lang][297], "297.als");
- talk(_text[_lang][298], "298.als");
+ talk(296);
+ talk(297);
+ talk(298);
sentido_hare = 1;
- talk(_text[_lang][299], "299.als");
- talk(_text[_lang][300], "300.als");
+ talk(299);
+ talk(300);
updateRoom();
copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
@@ -2474,7 +2474,7 @@
sentido_hare = 0;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
- talk(_text[_lang][301], "301.als");
+ talk(301);
v_cd = _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / 16;
v_cd = v_cd + 4;
playMusic(17);
@@ -2503,13 +2503,13 @@
void DrasculaEngine::animation_11_6() {
talk_taber2(_textt[_lang][10], "t10.als");
- talk(_text[_lang][268], "268.als");
+ talk(268);
talk_taber2(_textt[_lang][11], "t11.als");
}
void DrasculaEngine::animation_12_6() {
talk_taber2(_textt[_lang][12], "t12.als");
- talk(_text[_lang][270], "270.als");
+ talk(270);
talk_taber2(_textt[_lang][13], "t13.als");
talk_taber2(_textt[_lang][14], "t14.als");
}
@@ -2558,7 +2558,7 @@
loadPic("an12.alg");
decompressPic(extraSurface, 1);
- talk(_text[_lang][356], "356.als");
+ talk(356);
updateRefresh_pre();
@@ -2598,7 +2598,7 @@
loadPic("an12.alg");
decompressPic(extraSurface, 1);
- talk(_text[_lang][392], "392.als");
+ talk(392);
updateRefresh_pre();
@@ -2619,7 +2619,7 @@
flags[11] = 1;
talk_pianista(_textp[_lang][5], "P5.als");
- talk(_text[_lang][393], "393.als");
+ talk(393);
talk_pianista(_textp[_lang][17], "P17.als");
talk_pianista(_textp[_lang][18], "P18.als");
talk_pianista(_textp[_lang][19], "P19.als");
@@ -2697,13 +2697,13 @@
decompressPic(frontSurface, 1);
if (flags[41] == 0) {
- talk(_text[_lang][103], "103.als");
+ talk(103);
talk_drunk(_textb[_lang][4], "B4.als");
flags[12] = 1;
- talk(_text[_lang][367], "367.als");
+ talk(367);
talk_drunk(_textb[_lang][5], "B5.als");
flags[12] = 1;
- talk(_text[_lang][368], "368.als");
+ talk(368);
talk_drunk(_textb[_lang][6], "B6.als");
talk_drunk(_textb[_lang][7], "B7.als");
flags[41] = 1;
@@ -2721,7 +2721,7 @@
}
void DrasculaEngine::animation_22_2() {
- talk(_text[_lang][374],"374.als");
+ talk(374;
sentido_hare=2;
updateRoom();
@@ -3315,7 +3315,7 @@
flags[9] = 1;
pause(12);
- talk(_textd[_lang][56], "d56.als" );
+ talk([56 );
pause(8);
clearRoom();
@@ -3376,7 +3376,7 @@
void DrasculaEngine::animation_1_4() {
if (flags[21] == 0) {
strcpy(objName[2], "igor");
- talk(_text[_lang][275], "275.als");
+ talk(275);
updateRefresh_pre();
@@ -3401,7 +3401,7 @@
talk_igor_seated(_texti[_lang][15], "I15.als");
flags[21] = 1;
} else {
- talk(_text[_lang][356], "356.als");
+ talk(356);
updateRefresh_pre();
@@ -3419,7 +3419,7 @@
flags[18] = 1;
flags[20] = 1;
- talk(_text[_lang][276], "276.als");
+ talk(276);
pause(14);
talk_igor_seated(_texti[_lang][6], "I6.als");
}
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 08:30:40 UTC (rev 32382)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 08:48:01 UTC (rev 32383)
@@ -2628,7 +2628,7 @@
if (num_ejec == 1) {
if (objectNum[l] == 105 && flags[0] == 0)
- talk(_text[_lang][442], "442.als");
+ talk(442);
else {
updateDoor(l);
if (isDoor[l] != 0) {
@@ -2811,102 +2811,102 @@
if (menuScreen == 1) {
if (num_ejec == 1) {
if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
} else if (num_ejec == 2) {
if ((pickedObject == kVerbLook && fl == 22 && flags[23] == 0)
|| (pickedObject == kVerbOpen && fl == 22 && flags[23] == 0)) {
- talk(_text[_lang][164], "164.als");
+ talk(164);
flags[23] = 1;
withoutVerb();
addObject(7);
addObject(18);
} else if (pickedObject == kVerbLook && fl == 22 && flags[23] == 1)
- talk(_text[_lang][307], "307.als");
+ talk(307);
else if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
else if (pickedObject == kVerbLook && fl == 7)
- talk(_text[_lang][143], "143.als");
+ talk(143);
else if (pickedObject == kVerbTalk && fl == 7)
- talk(_text[_lang][144], "144.als");
+ talk(144);
else if (pickedObject == kVerbLook && fl == 8)
- talk(_text[_lang][145], "145.als");
+ talk(145);
else if (pickedObject == kVerbTalk && fl == 8)
- talk(_text[_lang][146], "146.als");
+ talk(146);
else if (pickedObject == kVerbLook && fl == 9)
- talk(_text[_lang][147], "147.als");
+ talk(147);
else if (pickedObject == kVerbTalk && fl == 9)
- talk(_text[_lang][148], "148.als");
+ talk(148);
else if (pickedObject == kVerbLook && fl == 10)
- talk(_text[_lang][151], "151.als");
+ talk(151);
else if (pickedObject == kVerbLook && fl == 11)
- talk(_text[_lang][152], "152.als");
+ talk(152);
else if (pickedObject == kVerbTalk && fl == 11)
- talk(_text[_lang][153], "153.als");
+ talk(153);
else if (pickedObject == kVerbLook && fl == 12)
- talk(_text[_lang][154], "154.als");
+ talk(154);
else if (pickedObject == kVerbLook && fl == 13)
- talk(_text[_lang][155], "155.als");
+ talk(155);
else if (pickedObject == kVerbLook && fl == 14)
- talk(_text[_lang][157], "157.als");
+ talk(157);
else if (pickedObject == kVerbLook && fl == 15)
- talk(_text[_lang][58], "58.als");
+ talk(58;
else if (pickedObject == kVerbLook && fl == 16)
- talk(_text[_lang][158], "158.als");
+ talk(158);
else if (pickedObject == kVerbLook && fl == 17)
- talk(_text[_lang][159], "159.als");
+ talk(159);
else if (pickedObject == kVerbLook && fl == 18)
- talk(_text[_lang][160], "160.als");
+ talk(160);
else if (pickedObject == kVerbLook && fl == 19)
- talk(_text[_lang][161], "161.als");
+ talk(161);
else if (pickedObject == kVerbLook && fl == 20)
- talk(_text[_lang][162], "162.als");
+ talk(162);
else if (pickedObject == kVerbLook && fl == 23)
- talk(_text[_lang][152], "152.als");
+ talk(152);
else
hasAnswer = 0;
} else if (num_ejec == 3) {
if (pickedObject == kVerbLook && fl == 22)
- talk(_text[_lang][307], "307.als");
+ talk(307);
else if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
else if (pickedObject == kVerbLook && fl == 7)
- talk(_text[_lang][143], "143.als");
+ talk(143);
else if (pickedObject == kVerbTalk && fl == 7)
- talk(_text[_lang][144], "144.als");
+ talk(144);
else if (pickedObject == kVerbLook && fl == 8)
- talk(_text[_lang][145], "145.als");
+ talk(145);
else if (pickedObject == kVerbTalk && fl == 8)
- talk(_text[_lang][146], "146.als");
+ talk(146);
else if (pickedObject == kVerbLook && fl == 9)
- talk(_text[_lang][147], "147.als");
+ talk(147);
else if (pickedObject == kVerbTalk && fl == 9)
- talk(_text[_lang][148], "148.als");
+ talk(148);
else if (pickedObject == kVerbLook && fl == 10)
- talk(_text[_lang][151], "151.als");
+ talk(151);
else if (pickedObject == kVerbLook && fl == 11)
- talk(_text[_lang][152], "152.als");
+ talk(152);
else if (pickedObject == kVerbTalk && fl == 11)
- talk(_text[_lang][153], "153.als");
+ talk(153);
else if (pickedObject == kVerbLook && fl == 12)
- talk(_text[_lang][154], "154.als");
+ talk(154);
else if (pickedObject == kVerbLook && fl == 13)
- talk(_text[_lang][155], "155.als");
+ talk(155);
else if (pickedObject == kVerbLook && fl == 14)
- talk(_text[_lang][157], "157.als");
+ talk(157);
else if (pickedObject == kVerbLook && fl == 15)
- talk(_text[_lang][58], "58.als");
+ talk(58;
else if (pickedObject == kVerbLook && fl == 16)
- talk(_text[_lang][158], "158.als");
+ talk(158);
else if (pickedObject == kVerbLook && fl == 17)
- talk(_text[_lang][159], "159.als");
+ talk(159);
else if (pickedObject == kVerbLook && fl == 18)
- talk(_text[_lang][160], "160.als");
+ talk(160);
else if (pickedObject == kVerbLook && fl == 19)
- talk(_text[_lang][161], "161.als");
+ talk(161);
else if (pickedObject == kVerbLook && fl == 20)
- talk(_text[_lang][162], "162.als");
+ talk(162);
else if (pickedObject == kVerbLook && fl == 23)
- talk(_text[_lang][152], "152.als");
+ talk(152);
else
hasAnswer = 0;
} else if (num_ejec == 4) {
@@ -2916,104 +2916,104 @@
removeObject(18);
removeObject(19);
} else if ((pickedObject == 14 && fl == 19) || (pickedObject == 19 && fl == 14))
- talk(_text[_lang][484], "484.als");
+ talk(484);
else if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
else if (pickedObject == kVerbLook && fl == 7)
- talk(_text[_lang][478], "478.als");
+ talk(478);
else if (pickedObject == kVerbLook && fl == 8)
- talk(_text[_lang][480], "480.als");
+ talk(480);
else if (pickedObject == kVerbLook && fl == 9) {
- talk(_text[_lang][482], "482.als");
- talk(_text[_lang][483], "483.als");
+ talk(482);
+ talk(483);
} else if (pickedObject == kVerbLook && fl == 10)
- talk(_text[_lang][485], "485.als");
+ talk(485);
else if (pickedObject == kVerbLook && fl == 11)
- talk(_text[_lang][488], "488.als");
+ talk(488);
else if (pickedObject == kVerbLook && fl == 12)
- talk(_text[_lang][486], "486.als");
+ talk(486);
else if (pickedObject == kVerbLook && fl == 13)
- talk(_text[_lang][490], "490.als");
+ talk(490);
else if (pickedObject == kVerbLook && fl == 14)
- talk(_text[_lang][122], "122.als");
+ talk(122);
else if (pickedObject == kVerbLook && fl == 15)
- talk(_text[_lang][117], "117.als");
+ talk(117);
else if (pickedObject == kVerbTalk && fl == 15)
- talk(_text[_lang][118], "118.als");
+ talk(118);
else if (pickedObject == kVerbOpen && fl == 15)
- talk(_text[_lang][119], "119.als");
+ talk(119);
else if (pickedObject == kVerbLook && fl == 16)
- talk(_text[_lang][491], "491.als");
+ talk(491);
else if (pickedObject == kVerbLook && fl == 17)
- talk(_text[_lang][478], "478.als");
+ talk(478);
else if (pickedObject == kVerbLook && fl == 18)
- talk(_text[_lang][493], "493.als");
+ talk(493);
else if (pickedObject == kVerbLook && fl == 19) {
- talk(_text[_lang][494], "494.als");
- talk(_text[_lang][495], "495.als");
+ talk(494);
+ talk(495);
} else if (pickedObject == kVerbLook && fl == 20)
- talk(_text[_lang][162], "162.als");
+ talk(162);
else if (pickedObject == kVerbLook && fl == 21)
- talk(_text[_lang][496], "496.als");
+ talk(496);
else if (pickedObject == kVerbLook && fl == 22)
- talk(_text[_lang][161], "161.als");
+ talk(161);
else
hasAnswer = 0;
} else if (num_ejec == 5) {
if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
else if (pickedObject == kVerbLook && fl == 7)
- talk(_text[_lang][478],"478.als");
+ talk(478;
else if (pickedObject == kVerbLook && fl == 8)
- talk(_text[_lang][120], "120.als");
+ talk(120);
else if (pickedObject == kVerbLook && fl == 9) {
- talk(_text[_lang][482], "482.als");
- talk(_text[_lang][483], "483.als");
+ talk(482);
+ talk(483);
} else if (pickedObject == kVerbLook && fl == 11)
- talk(_text[_lang][488], "488.als");
+ talk(488);
else if (pickedObject == kVerbLook && fl == 13)
- talk(_text[_lang][490], "490.als");
+ talk(490);
else if (pickedObject == kVerbLook && fl == 14)
- talk(_text[_lang][121], "121.als");
+ talk(121);
else if (pickedObject == kVerbLook && fl == 15)
- talk(_text[_lang][117], "117.als");
+ talk(117);
else if (pickedObject == kVerbTalk && fl == 15)
- talk(_text[_lang][118], "118.als");
+ talk(118);
else if (pickedObject == kVerbOpen && fl == 15)
- talk(_text[_lang][119], "119.als");
+ talk(119);
else if (pickedObject == kVerbLook && fl == 17)
- talk(_text[_lang][478], "478.als");
+ talk(478);
else if (pickedObject == kVerbLook && fl == 20)
- talk(_text[_lang][162], "162.als");
+ talk(162);
else
hasAnswer = 0;
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook && fl == 28)
- talk(_text[_lang][328], "328.als");
+ talk(328);
else if (pickedObject == kVerbLook && fl == 9) {
- talk(_text[_lang][482], "482.als");
- talk(_text[_lang][483], "483.als");
+ talk(482);
+ talk(483);
} else if (pickedObject == kVerbLook && fl == 20)
- talk(_text[_lang][123], "123.als");
+ talk(123);
else if (pickedObject == kVerbLook && fl == 21)
- talk(_text[_lang][441], "441.als");
+ talk(441);
else
hasAnswer = 0;
}
} else {
if (num_ejec == 1) {
if (pickedObject == kVerbLook && fl == 50)
- talk(_text[_lang][308], "308.als");
+ talk(308);
else if (pickedObject == kVerbOpen && fl == 50)
- talk(_text[_lang][310], "310.als");
+ talk(310);
else if (pickedObject == kVerbClose && fl == 50)
- talk(_text[_lang][311], "311.als");
+ talk(311);
else if (pickedObject == kVerbMove && fl == 50)
- talk(_text[_lang][312], "312.als");
+ talk(312);
else if (pickedObject == kVerbPick && fl == 50)
- talk(_text[_lang][313], "313.als");
+ talk(313);
else if (pickedObject == kVerbTalk && fl == 50)
- talk(_text[_lang][314], "314.als");
+ talk(314);
else if (roomNumber == 62)
room_62(fl);
else if (roomNumber == 63)
@@ -3022,24 +3022,24 @@
hasAnswer = 0;
} else if (num_ejec == 2) {
if (pickedObject == kVerbLook && fl == 50)
- talk(_text[_lang][308], "308.als");
+ talk(308);
else if (pickedObject == kVerbOpen && fl == 50)
- talk(_text[_lang][310], "310.als");
+ talk(310);
else if (pickedObject == kVerbClose && fl == 50)
- talk(_text[_lang][311], "311.als");
+ talk(311);
else if (pickedObject == kVerbMove && fl == 50)
- talk(_text[_lang][312], "312.als");
+ talk(312);
else if (pickedObject == kVerbPick && fl == 50)
- talk(_text[_lang][313], "313.als");
+ talk(313);
else if (pickedObject == kVerbTalk && fl == 50)
- talk(_text[_lang][314], "314.als");
+ talk(314);
// Note: the original check was strcmp(num_room, "18.alg")
else if (pickedObject == 11 && fl == 50 && flags[22] == 0 && roomNumber != 18)
- talk(_text[_lang][315], "315.als");
+ talk(315);
else if (pickedObject == 13 && fl == 50)
- talk(_text[_lang][156], "156.als");
+ talk(156);
else if (pickedObject == 20 && fl == 50)
- talk(_text[_lang][163], "163.als");
+ talk(163);
else if (roomNumber == 1)
room_1(fl);
else if (roomNumber == 3)
@@ -3074,17 +3074,17 @@
hasAnswer = 0;
} else if (num_ejec == 3) {
if (pickedObject == kVerbLook && fl == 50)
- talk(_text[_lang][309], "309.als");
+ talk(309);
else if (pickedObject == kVerbOpen && fl == 50)
- talk(_text[_lang][310], "310.als");
+ talk(310);
else if (pickedObject == kVerbClose && fl == 50)
- talk(_text[_lang][311], "311.als");
+ talk(311);
else if (pickedObject == kVerbMove && fl == 50)
- talk(_text[_lang][312], "312.als");
+ talk(312);
else if (pickedObject == kVerbPick && fl == 50)
- talk(_text[_lang][313], "313.als");
+ talk(313);
else if (pickedObject == kVerbTalk && fl == 50)
- talk(_text[_lang][314], "314.als");
+ talk(314);
else if (roomNumber == 13) {
if (room_13(fl))
return true;
@@ -3092,27 +3092,27 @@
hasAnswer = 0;
} else if (num_ejec == 4) {
if (roomNumber == 28)
- talk(_text[_lang][178], "178.als");
+ talk(178);
else if (pickedObject == kVerbLook && fl == 50)
- talk(_text[_lang][309], "309.als");
+ talk(309);
else if (pickedObject == kVerbOpen && fl == 50)
- talk(_text[_lang][310], "310.als");
+ talk(310);
else if (pickedObject == kVerbClose && fl == 50)
- talk(_text[_lang][311], "311.als");
+ talk(311);
else if (pickedObject == kVerbMove && fl == 50)
- talk(_text[_lang][312], "312.als");
+ talk(312);
else if (pickedObject == kVerbPick && fl == 50)
- talk(_text[_lang][313], "313.als");
+ talk(313);
else if (pickedObject == kVerbTalk && fl == 50)
- talk(_text[_lang][314], "314.als");
+ talk(314);
else if (pickedObject == 8 && fl == 50 && flags[18] == 0)
- talk(_text[_lang][481], "481.als");
+ talk(481);
else if (pickedObject == 9 && fl == 50)
- talk(_text[_lang][484], "484.als");
+ talk(484);
else if (pickedObject == 12 && fl == 50 && flags[18] == 0)
- talk(_text[_lang][487], "487.als");
+ talk(487);
else if (pickedObject == 20 && fl == 50)
- talk(_text[_lang][487], "487.als");
+ talk(487);
else if (roomNumber == 21) {
if (room_21(fl))
return true;
@@ -3154,7 +3154,7 @@
else if (pickedObject == kVerbTalk && fl == 50)
talk("hola yo", "16.als");
else if (pickedObject == 20 && fl == 50)
- talk(_text[_lang][487], "487.als");
+ talk(487);
else if (roomNumber == 49)
room_49(fl);
else if (roomNumber == 53)
@@ -3170,19 +3170,19 @@
hasAnswer = 0;
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook && fl == 50 && flags[0] == 1)
- talk(_text[_lang][308], "308.als");
+ talk(308);
else if (pickedObject == kVerbLook && fl == 50 && flags[0] == 0)
- talk(_text[_lang][310], "250.als" );
+ talk(310 );
else if (pickedObject == kVerbOpen && fl == 50)
- talk(_text[_lang][310], "310.als" );
+ talk(310 );
else if (pickedObject == kVerbClose && fl == 50)
- talk(_text[_lang][311], "311.als" );
+ talk(311 );
else if (pickedObject == kVerbMove && fl == 50)
- talk(_text[_lang][312], "312.als" );
+ talk(312 );
else if (pickedObject == kVerbPick && fl == 50)
- talk(_text[_lang][313], "313.als" );
+ talk(313 );
else if (pickedObject == kVerbTalk && fl == 50)
- talk(_text[_lang][314], "314.als" );
+ talk(314 );
else if (roomNumber == 102)
room_pendulum(fl);
else if (roomNumber == 58)
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 08:30:40 UTC (rev 32382)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 08:48:01 UTC (rev 32383)
@@ -217,68 +217,68 @@
// non-default actions
if (num_ejec == 2) {
if (pickedObject == kVerbLook) {
- talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
+ talk(mirar_t[c_mirarc_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 4) {
if (pickedObject == kVerbLook) {
- talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
+ talk(mirar_t[c_mirarc_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 5) {
if (pickedObject == kVerbLook) {
- talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
+ talk(mirar_t[c_mirarc_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook) {
- talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
+ talk(mirar_t[c_mirarc_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
+ talk(poder_t[c_poderc_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
@@ -556,7 +556,7 @@
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
playSound("s8.als");
stopSound();
- talk(_text[_lang][338], "338.als");
+ talk(338);
flags[27] = 0;
pickObject(19);
removeObject(18);
@@ -582,15 +582,15 @@
void DrasculaEngine::room_16(int fl) {
if (pickedObject == kVerbTalk && fl == 163)
- talk(_text[_lang][6], "6.als");
+ talk(6
else if (pickedObject == kVerbOpen && fl == 163)
openDoor(17, 0);
else if (pickedObject == kVerbClose && fl == 163)
closeDoor(17, 0);
else if (pickedObject == kVerbLook && fl == 183)
- talk(_text[_lang][340], "340.als");
+ talk(340);
else if (pickedObject == kVerbTalk && fl == 183) {
- talk(_text[_lang][341], "341.als");
+ talk(341);
pause(10);
talk_sinc(_text[_lang][50], "50.als", "11111111111144432554433");
pause(3);
@@ -602,40 +602,40 @@
sentido_hare = 3;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
- talk(_text[_lang][342], "342.als");
+ talk(342);
pickObject(22);
}
} else if (pickedObject == kVerbClose && fl == 183)
closeDoor(19, NO_DOOR);
else if (pickedObject == kVerbLook && fl == 185)
- talk(_text[_lang][37], "37.als");
+ talk(37;
else if (pickedObject == kVerbPick && fl == 185)
- talk(_text[_lang][7], "7.als");
+ talk(7
else if (pickedObject == kVerbMove && fl == 185)
- talk(_text[_lang][7], "7.als");
+ talk(7
else if (pickedObject == kVerbTalk && fl == 185)
- talk(_text[_lang][38], "38.als");
+ talk(38;
else if (pickedObject == kVerbLook && fl == 187) {
- talk(_text[_lang][343], "343.als");
+ talk(343);
sentido_hare = 3;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
- talk(_text[_lang][344], "344.als");
+ talk(344);
} else if (pickedObject == kVerbTalk && fl == 187)
- talk(_text[_lang][345], "345.als");
+ talk(345);
else
hasAnswer = 0;
}
void DrasculaEngine::room_17(int fl) {
if (pickedObject == kVerbLook && fl == 177)
- talk(_text[_lang][35], "35.als");
+ talk(35;
else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 0)
- talk(_text[_lang][6], "6.als");
+ talk(6
else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 1)
animation_18_2();
else if (pickedObject == kVerbOpen && fl == 177 && flags[18] == 1)
- talk(_text[_lang][346], "346.als");
+ talk(346);
else if (pickedObject == kVerbOpen && fl == 177 && flags[14] == 0 && flags[18] == 0)
animation_22_2();
else if (pickedObject == kVerbOpen && fl == 177 && flags[14] == 1)
@@ -643,7 +643,7 @@
else if (pickedObject == kVerbClose && fl == 177 && flags[14] == 1)
closeDoor(15, 1);
else if (pickedObject == 11 && fl == 50 && flags[22] == 0) {
- talk(_text[_lang][347], "347.als");
+ talk(347);
flags[29] = 1;
pickObject(23);
removeObject(11);
@@ -655,9 +655,9 @@
if (pickedObject == kVerbTalk && fl == 55 && flags[36] == 0)
animation_24_2();
else if (pickedObject == kVerbTalk && fl == 55 && flags[36] == 1)
- talk(_text[_lang][109], "109.als");
+ talk(109);
else if (pickedObject == kVerbLook && fl == 181)
- talk(_text[_lang][348], "348.als");
+ talk(348);
else if (pickedObject == kVerbPick && fl == 182) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
@@ -669,17 +669,17 @@
visible[2] = 0;
flags[28] = 1;
} else if (pickedObject == kVerbLook && fl == 182)
- talk(_text[_lang][154], "154.als");
+ talk(154);
else if (pickedObject == 8 && fl == 55 && flags[38] == 0 && flags[33] == 1)
- talk(_text[_lang][349], "349.als");
+ talk(349);
else if (pickedObject == 13 && fl == 55 && flags[38] == 0 && flags[33] == 1)
- talk(_text[_lang][349], "349.als");
+ talk(349);
else if (pickedObject == 15 && fl == 55 && flags[38] == 0 && flags[33] == 1)
- talk(_text[_lang][349], "349.als");
+ talk(349);
else if (pickedObject == 16 && fl == 55 && flags[38] == 0 && flags[33] == 1)
- talk(_text[_lang][349], "349.als");
+ talk(349);
else if (pickedObject == 17 && fl == 55 && flags[38] == 0 && flags[33] == 1)
- talk(_text[_lang][349], "349.als");
+ talk(349);
else if (pickedObject == 8 && fl == 55 && flags[38] == 1 && flags[33] == 1)
animation_24_2();
else if (pickedObject == 13 && fl == 55 && flags[38] == 1 && flags[33] == 1)
@@ -700,7 +700,7 @@
updateRefresh();
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
pause(6);
- talk(_text[_lang][347], "347.als");
+ talk(347);
flags[29] = 1;
pickObject(23);
removeObject(11);
@@ -710,14 +710,14 @@
void DrasculaEngine::room_19(int fl) {
if (pickedObject == kVerbLook && fl == 214)
- talk(_text[_lang][191], "191.als");
+ talk(191);
else
hasAnswer = 0;
}
bool DrasculaEngine::room_21(int fl) {
if (pickedObject == kVerbOpen && fl == 101 && flags[28] == 0)
- talk(_text[_lang][419], "419.als");
+ talk(419);
else if (pickedObject == kVerbOpen && fl == 101 && flags[28] == 1)
openDoor(0, 1);
else if (pickedObject == kVerbClose && fl == 101)
@@ -741,7 +741,7 @@
void DrasculaEngine::room_22(int fl) {
if (pickedObject == kVerbPick && fl == 140)
- talk(_text[_lang][7], "7.als");
+ talk(7
else if (pickedObject == 11 && fl == 140) {
pickObject(18);
visible[1] = 0;
@@ -756,14 +756,14 @@
removeObject(22);
updateData();
sentido_hare = 3;
- talk(_text[_lang][499], "499.als");
- talk(_text[_lang][500], "500.als");
+ talk(499);
+ talk(500);
} else if (pickedObject == kVerbLook && fl == 52)
- talk(_text[_lang][497], "497.als");
+ talk(497);
else if (pickedObject == kVerbTalk && fl == 52)
- talk(_text[_lang][498], "498.als");
+ talk(498);
else if (pickedObject == kVerbPick && fl == 180 && flags[26] == 0)
- talk(_text[_lang][420], "420.als");
+ talk(420);
else if (pickedObject == kVerbPick && fl == 180 && flags[26] == 1) {
pickObject(7);
visible[3] = 0;
@@ -805,7 +805,7 @@
else if (pickedObject == kVerbClose && fl == 106)
closeDoor(2, 1);
else if (pickedObject == kVerbLook && fl == 151)
- talk(_text[_lang][461], "461.als");
+ talk(461);
else
hasAnswer = 0;
}
@@ -814,7 +814,7 @@
if (pickedObject == kVerbOpen && fl == 107 && flags[30] == 0)
openDoor(2, 0);
else if (pickedObject == kVerbOpen && fl == 107 && flags[30] == 1)
- talk(_text[_lang][421], "421.als");
+ talk(421);
else if (pickedObject == kVerbClose && fl == 107)
closeDoor(2, 0);
else if (pickedObject == 10 && fl == 50 && flags[18] == 1 && flags[12] == 1)
@@ -846,21 +846,21 @@
} else if (pickedObject == kVerbTalk && fl == 51)
animation_1_4();
else if (pickedObject == kVerbOpen && fl == 167)
- talk(_text[_lang][467], "467.als");
+ talk(467);
else if (pickedObject == kVerbLook && fl == 164)
- talk(_text[_lang][470], "470.als");
+ talk(470);
else if (pickedObject == kVerbOpen && fl == 164)
- talk(_text[_lang][471], "471.als");
+ talk(471);
else if (pickedObject == kVerbLook && fl == 163)
- talk(_text[_lang][472], "472.als");
+ talk(472);
else if (pickedObject == kVerbPick && fl == 163)
- talk(_text[_lang][473], "473.als");
+ talk(473);
else if (pickedObject == kVerbLook && fl == 165)
- talk(_text[_lang][474], "474.als");
+ talk(474);
else if (pickedObject == kVerbLook && fl == 168)
- talk(_text[_lang][476], "476.als");
+ talk(476);
else if (pickedObject == kVerbPick && fl == 168)
- talk(_text[_lang][477], "477.als");
+ talk(477);
else
hasAnswer = 0;
}
@@ -871,7 +871,7 @@
else if (pickedObject == kVerbClose && fl == 110)
closeDoor(6, 1);
else if (pickedObject == kVerbOpen && fl == 116 && flags[23] == 0)
- talk(_text[_lang][419], "419.als");
+ talk(419);
else if (pickedObject == kVerbOpen && fl == 116 && flags[23] == 1)
openDoor(5, 3);
else if (pickedObject == 17 && fl == 116) {
@@ -879,9 +879,9 @@
openDoor(5,3);
withoutVerb();
} else if (pickedObject == kVerbLook && fl == 175)
- talk(_text[_lang][429], "429.als");
+ talk(429);
else if (fl == 150)
- talk(_text[_lang][460], "460.als");
+ talk(460);
else
hasAnswer = 0;
}
@@ -892,15 +892,15 @@
else if (pickedObject == kVerbClose && fl == 114)
closeDoor(4, 1);
else if (pickedObject == kVerbLook && fl == 152)
- talk(_text[_lang][463], "463.als");
+ talk(463);
else if (pickedObject == kVerbOpen && fl == 152)
- talk(_text[_lang][464], "464.als");
+ talk(464);
else if (pickedObject == kVerbLook && fl == 153)
- talk(_text[_lang][465], "465.als");
+ talk(465);
else if (pickedObject == kVerbPick && fl == 154)
- talk(_text[_lang][466], "466.als");
+ talk(466);
else if (pickedObject == kVerbOpen && fl == 156)
- talk(_text[_lang][467], "467.als");
+ talk(467);
else
hasAnswer = 0;
}
@@ -911,12 +911,12 @@
else if (pickedObject == kVerbClose && fl == 115)
closeDoor(4, 0);
else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 0)
- talk(_text[_lang][422], "422.als");
+ talk(422);
else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 1 && flags[22] == 1)
openDoor(16, 1);
else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 1 && flags[22] == 0) {
openDoor(16, 1);
- talk(_text[_lang][423], "423.als");
+ talk(423);
flags[22] = 1;
pickObject(12);
if (flags[11] == 1 && flags[14] == 1)
@@ -926,12 +926,12 @@
} else if (pickedObject == kVerbClose && fl == 144)
closeDoor(16, 1);
else if (pickedObject == 13 && fl == 144) {
- talk(_text[_lang][424], "424.als");
+ talk(424);
flags[19] = 1;
} else if (pickedObject == kVerbOpen && fl == 157)
- talk(_text[_lang][468], "468.als");
+ talk(468);
else if (pickedObject == kVerbLook && fl == 158)
- talk(_text[_lang][469], "469.als");
+ talk(469);
else
hasAnswer = 0;
}
@@ -946,9 +946,9 @@
else if (pickedObject == kVerbClose && fl == 117)
closeDoor(5, 0);
else if (pickedObject == kVerbLook && fl == 161)
- talk(_text[_lang][470], "470.als");
+ talk(470);
else if (pickedObject == kVerbOpen && fl == 161)
- talk(_text[_lang][471], "471.als");
+ talk(471);
else
hasAnswer = 0;
}
@@ -957,15 +957,15 @@
if (pickedObject == kVerbMove && fl == 146)
animation_8_4();
else if (pickedObject == kVerbLook && fl == 146)
- talk(_text[_lang][458], "458.als");
+ talk(458);
else if (pickedObject == kVerbPick && fl == 146)
- talk(_text[_lang][459], "459.als");
+ talk(459);
else if (pickedObject == kVerbOpen && fl == 120 && flags[25] == 1)
openDoor(8, 2);
else if (pickedObject == kVerbOpen && fl == 120 && flags[25] == 0) {
openDoor(8, 2);
sentido_hare = 3;
- talk(_text[_lang][425], "425.als");
+ talk(425);
pickObject(14);
flags[25] = 1;
} else if (pickedObject == kVerbClose && fl == 120)
@@ -984,7 +984,7 @@
if (flags[18] == 1)
animation_6_4();
} else if (pickedObject == kVerbPick && fl == 147) {
- talk(_text[_lang][426], "426.als");
+ talk(426);
pickObject(15);
visible[1] = 0;
flags[15] = 1;
@@ -1000,7 +1000,7 @@
void DrasculaEngine::room_44(int fl) {
if (pickedObject == kVerbLook && fl == 172)
- talk(_text[_lang][428], "428.als");
+ talk(428);
else
hasAnswer = 0;
}
@@ -1009,17 +1009,17 @@
if (pickedObject == kVerbTalk && fl ==51)
converse("op_9.cal");
else if (pickedObject == kVerbLook && fl == 51)
- talk(_text[_lang][132], "132.als");
+ talk(132);
else if ((pickedObject == 8 && fl == 51) || (pickedObject == 8 && fl == 203))
animation_5_5();
else if (pickedObject == kVerbLook && fl == 200)
- talk(_text[_lang][133], "133.als");
+ talk(133);
else if (pickedObject == kVerbTalk && fl == 200)
- talk(_text[_lang][134], "134.als");
+ talk(134);
else if (pickedObject == kVerbLook && fl == 201)
- talk(_text[_lang][135], "135.als");
+ talk(135);
else if (pickedObject == kVerbLook && fl == 203)
- talk(_text[_lang][137], "137.als");
+ talk(137);
else
hasAnswer = 0;
}
@@ -1029,15 +1029,15 @@
pickObject(16);
visible[3] = 0;
} else if (pickedObject == kVerbLook && fl == 121)
- talk(_text[_lang][128], "128.als");
+ talk(128);
else if (pickedObject == kVerbLook && fl == 209)
- talk(_text[_lang][129], "129.als");
+ talk(129);
else if (pickedObject == kVerbMove && fl == 123)
animation_11_5();
else if (pickedObject == kVerbLook && fl == 52)
- talk(_text[_lang][447], "447.als");
+ talk(447);
else if (pickedObject == kVerbTalk && fl == 52)
- talk(_text[_lang][131], "131.als");
+ talk(131);
else if (pickedObject == 12 && fl == 52)
animation_10_5();
else if (pickedObject == 15 && fl == 52)
@@ -1047,7 +1047,7 @@
withoutVerb();
updateData();
} else if (pickedObject == 16) {
- talk(_text[_lang][439], "439.als");
+ talk(439);
withoutVerb();
visible[3] = 1;
} else
@@ -1058,34 +1058,34 @@
if ((pickedObject == kVerbTalk && fl == 118) || (pickedObject == kVerbLook && fl == 118 && flags[0] == 0))
animation_1_5();
else if (pickedObject == kVerbLook && fl == 118 && flags[0]==1)
- talk(_text[_lang][124], "124.als");
+ talk(124);
else if (pickedObject == kVerbLook && fl == 53)
- talk(_text[_lang][127], "127.als");
+ talk(127);
else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 0) {
- talk(_text[_lang][288], "288.als");
+ talk(288);
flags[12] = 1;
pause(10);
talk_mus(_texte[_lang][1], "E1.als");
- talk(_text[_lang][289], "289.als");
+ talk(289);
talk_mus(_texte[_lang][2], "E2.als");
talk_mus(_texte[_lang][3], "E3.als");
converse("op_10.cal");
flags[12] = 0;
flags[14] = 1;
} else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 1)
- talk(_text[_lang][109], "109.als");
+ talk(109);
else if (pickedObject == kVerbPick && fl == 9999 && flags[13] == 0) {
pickObject(8);
flags[13] = 1;
talk_mus(_texte[_lang][10], "e10.als");
updateData();
} else if (pickedObject == kVerbOpen && fl == 119)
- talk(_text[_lang][125], "125.als");
+ talk(125);
else if (pickedObject == kVerbLook && fl == 119)
- talk(_text[_lang][126], "126.als");
+ talk(126);
else if (pickedObject == 10 && fl == 119) {
pause(4);
- talk(_text[_lang][436], "436.als");
+ talk(436);
withoutVerb();
removeObject(10);
} else
@@ -1098,11 +1098,11 @@
flags[8] = 1;
updateData();
} else if (pickedObject == kVerbLook && fl == 122)
- talk(_text[_lang][138], "138.als");
+ talk(138);
else if (pickedObject == kVerbLook && fl == 204)
- talk(_text[_lang][139], "139.als");
+ talk(139);
else if (pickedObject == kVerbLook && fl == 205)
- talk(_text[_lang][140], "140.als");
+ talk(140);
else if (fl == 206) {
playSound("s11.als");
animate("det.bin", 17);
@@ -1117,11 +1117,11 @@
animation_14_5();
return true;
} else if (pickedObject == kVerbLook && fl == 124)
- talk(_text[_lang][450], "450.als");
+ talk(450);
else if (pickedObject == kVerbOpen && fl == 207)
- talk(_text[_lang][141], "141.als");
+ talk(141);
else if (pickedObject == kVerbLook && fl == 208)
- talk(_text[_lang][142], "142.als");
+ talk(142);
else
hasAnswer = 0;
@@ -1132,7 +1132,7 @@
if (pickedObject == kVerbMove && fl == 103)
animation_7_6();
else if (pickedObject == kVerbLook && fl == 104)
- talk(_text[_lang][454], "454.als");
+ talk(454);
else
hasAnswer = 0;
}
@@ -1203,7 +1203,7 @@
loadPic("59.alg");
decompressPic(drawSurface1, HALF_PAL);
sentido_hare = 3;
- talk(_text[_lang][245], "245.als");
+ talk(245);
withoutVerb();
flags[11] = 1;
}
@@ -1215,27 +1215,27 @@
if (pickedObject == kVerbMove && fl == 112)
animation_10_6();
else if (pickedObject == kVerbLook && fl == 112)
- talk(_text[_lang][440], "440.als");
+ talk(440);
else if (pickedObject == kVerbTalk && fl == 52) {
- talk(_text[_lang][266], "266.als");
+ talk(266);
talk_taber2(_textt[_lang][1], "t1.als");
converse("op_12.cal");
withoutVerb();
pickedObject = 0;
} else if (pickedObject == kVerbTalk && fl == 115)
- talk(_text[_lang][455], "455.als");
+ talk(455);
else if (pickedObject == kVerbTalk && fl == 56)
- talk(_text[_lang][455], "455.als");
+ talk(455);
else if (pickedObject == kVerbLook && fl == 114)
- talk(_text[_lang][167], "167.als");
+ talk(167);
else if (pickedObject == kVerbLook && fl == 113)
- talk(_text[_lang][168], "168.als");
+ talk(168);
else if (pickedObject == kVerbPick && fl == 113)
- talk(_text[_lang][170], "170.als");
+ talk(170);
else if (pickedObject == kVerbMove && fl == 113)
- talk(_text[_lang][170], "170.als");
+ talk(170);
else if (pickedObject == kVerbTalk && fl == 113)
- talk(_text[_lang][169], "169.als");
+ talk(169);
else if (pickedObject == 21 && fl == 56)
animation_18_6();
else if (pickedObject == 9 && fl == 56 && flags[6] == 1) {
@@ -1243,7 +1243,7 @@
return true;
} else if (pickedObject == 9 && fl == 56 && flags[6] == 0) {
animate("cnf.bin", 14);
- talk(_text[_lang][455], "455.als");
+ talk(455);
} else
hasAnswer = 0;
@@ -1252,13 +1252,13 @@
void DrasculaEngine::room_61(int fl) {
if (pickedObject == kVerbLook && fl == 116)
- talk(_text[_lang][172], "172.als");
+ talk(172);
else if (pickedObject == kVerbLook && fl == 117)
- talk(_text[_lang][173], "173.als");
+ talk(173);
else if (pickedObject == kVerbMove && fl == 117)
- talk(_text[_lang][174], "174.als");
+ talk(174);
else if (pickedObject == kVerbOpen && fl == 117)
- talk(_text[_lang][174], "174.als");
+ talk(174);
else
hasAnswer = 0;
}
@@ -1269,50 +1269,50 @@
else if (pickedObject == kVerbTalk && fl == 52 && flags[0] == 0)
animation_3_1();
else if (pickedObject == kVerbTalk && fl == 52 && flags[0] == 1)
- talk(_text[_lang][109], "109.als");
+ talk(109);
else if (pickedObject == kVerbTalk && fl == 54)
animation_4_1();
else if (pickedObject == kVerbLook && fl == 100)
- talk(_text[_lang][168], "168.als");
+ talk(168);
else if (pickedObject == kVerbTalk && fl == 100)
- talk(_text[_lang][169], "169.als");
+ talk(169);
else if (pickedObject == kVerbPick && fl == 100)
- talk(_text[_lang][170], "170.als");
+ talk(170);
else if (pickedObject == kVerbLook && fl == 101)
- talk(_text[_lang][171], "171.als");
+ talk(171);
else if (pickedObject == kVerbLook && fl == 102)
- talk(_text[_lang][167], "167.als");
+ talk(167);
else if (pickedObject == kVerbLook && fl == 103)
- talk(_text[_lang][166], "166.als");
+ talk(166);
else hasAnswer = 0;
}
void DrasculaEngine::room_63(int fl) {
if (pickedObject == kVerbLook && fl == 110)
- talk(_text[_lang][172], "172.als");
+ talk(172);
else if (pickedObject == kVerbLook && fl == 109)
- talk(_text[_lang][173], "173.als");
+ talk(173);
else if (pickedObject == kVerbMove && fl == 109)
- talk(_text[_lang][174], "174.als");
+ talk(174);
else if (pickedObject == kVerbLook && fl == 108)
- talk(_text[_lang][334], "334.als");
+ talk(334);
else if (pickedObject == kVerbTalk && fl == 108)
- talk(_text[_lang][333], "333.als");
+ talk(333);
else
hasAnswer = 0;
}
void DrasculaEngine::room_pendulum(int fl) {
if (pickedObject == kVerbLook && fl == 100)
- talk(_text[_lang][452], "452.als");
+ talk(452);
else if (pickedObject == kVerbLook && fl == 101)
- talk (_text[_lang][123], "123.als");
+ talk(123);
else if (pickedObject == kVerbPick && fl == 101)
pickObject(20);
else if (pickedObject == 20 && fl == 100)
animation_6_6();
else if (pickedObject == kVerbPick || pickedObject == kVerbOpen)
- talk(_text[_lang][453], "453.als");
+ talk(453);
else
hasAnswer = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list