[Scummvm-cvs-logs] SF.net SVN: scummvm: [32424] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat May 31 14:40:02 CEST 2008
Revision: 32424
http://scummvm.svn.sourceforge.net/scummvm/?rev=32424&view=rev
Author: thebluegr
Date: 2008-05-31 05:40:02 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Simplified calls to updateScreen()
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/rooms.cpp
scummvm/trunk/engines/drascula/talk.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-31 10:24:45 UTC (rev 32423)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-31 12:40:02 UTC (rev 32424)
@@ -78,7 +78,7 @@
clearRoom();
loadAndDecompressPic("cielo.alg", screenSurface, COMPLETE_PAL);
black();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(2);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -87,7 +87,7 @@
break;
color_abc(kColorRed);
centerText(_textmisc[_lang][1], 160, 100);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(1000);
@@ -111,7 +111,7 @@
if (animate("scr3.bin", 17))
break;
loadAndDecompressPic("cielo2.alg", screenSurface, COMPLETE_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
fadeToBlack(1);
@@ -135,7 +135,7 @@
for (l = 0; l < 7; l++) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
copyBackground(interf_x[l], interf_y[l], 156, 45, 63, 31, drawSurface2, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (getScan() == Common::KEYCODE_ESCAPE) {
term_int = 1;
break;
@@ -159,7 +159,7 @@
pixelPos[2] = 156 - l;
copyRectClip(pixelPos, drawSurface2, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
p++;
if (p == 6) {
p = 0;
@@ -195,14 +195,14 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_igor_dch(8);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_dr_izq(2);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -216,13 +216,13 @@
clearRoom();
color_solo = kColorRed;
loadAndDecompressPic("plan1.alg", screenSurface, HALF_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(10);
talk_solo(_textd[_lang][4],"d4.als");
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadAndDecompressPic("plan1.alg", screenSurface, HALF_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_solo(_textd[_lang][5], "d5.als");
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -230,7 +230,7 @@
break;
clearRoom();
loadAndDecompressPic("plan2.alg", screenSurface, HALF_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(20);
talk_solo(_textd[_lang][6], "d6.als");
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
@@ -239,7 +239,7 @@
break;
clearRoom();
loadAndDecompressPic("plan3.alg", screenSurface, HALF_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(20);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -247,7 +247,7 @@
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadAndDecompressPic("plan3.alg", screenSurface, HALF_PAL);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_solo(_textd[_lang][8], "d8.als");
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -299,13 +299,13 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(1);
sentido_dr = 0;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_dr_izq(12);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -313,13 +313,13 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(1);
sentido_dr = 1;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_igor_dch(2);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -331,13 +331,13 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(1);
sentido_dr = 0;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_dr_izq(14);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -438,7 +438,7 @@
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
black();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(1);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -511,7 +511,7 @@
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(120);
@@ -524,7 +524,7 @@
updateRoom();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(110);
talk_solo(_textbj[_lang][11], "BJ11.als");
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
@@ -532,7 +532,7 @@
updateRoom();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(118);
@@ -568,19 +568,19 @@
break;
pause(8);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(225);
pause(76);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_hare = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(226);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(30);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -645,7 +645,7 @@
copyBackground(49, 139, 228, 112, 47, 60, extraSurface, screenSurface);
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
stopMusic();
@@ -677,13 +677,13 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
pon_hare();
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("an2_1.alg", frontSurface, 1);
loadAndDecompressPic("an2_2.alg", extraSurface, 1);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
copyBackground(1, 1, 201, 87, 50, 52, frontSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
updateAnim(1, 201, 87, 50, 52, 6, frontSurface);
updateAnim(55, 201, 87, 50, 52, 6, frontSurface);
@@ -696,7 +696,7 @@
updateAnim(109, 201, 87, 50, 52, 2, extraSurface);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
@@ -732,7 +732,7 @@
textSurface = frontSurface;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(10);
@@ -756,13 +756,13 @@
talk_hacker(_textd[_lang][63],"d63.als");
talk_blind(_textd[_lang][75],"d75.als", _textd1[_lang][75 - TEXTD_START]);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
_system->delayMillis(1000);
talk_hacker(_textd[_lang][64], "d64.als");
talk_blind(_textd[_lang][76], "d76.als", _textd1[_lang][76 - TEXTD_START]);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(14);
@@ -830,7 +830,7 @@
pos_cabina[3] = n;
copyRectClip(pos_cabina, backSurface, screenSurface);
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
l = l + 1;
}
@@ -884,7 +884,7 @@
if (_lang != kSpanish)
centerText(_texthis[_lang][1], 180, 180);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (_lang == kSpanish)
fadeFromBlack(1);
@@ -914,7 +914,7 @@
if (_lang != kSpanish)
centerText(_texthis[_lang][2], 180, 180);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
key = getScan();
if (key != 0)
goto asco;
@@ -940,7 +940,7 @@
if (_lang != kSpanish)
centerText(_texthis[_lang][3], 180, 180);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
key = getScan();
if (key != 0)
goto asco;
@@ -965,7 +965,7 @@
if (_lang != kSpanish)
centerText(_texthis[_lang][1], 180, 180);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
key = getScan();
if (key != 0)
goto asco;
@@ -982,7 +982,7 @@
for (l = 1; l < 200; l++) {
copyBackground(0, 0, 0, l, 320, 200 - l, drawSurface3, screenSurface);
copyBackground(0, 200 - l, 0, 0, 320, l, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
key = getScan();
if (key != 0)
goto asco;
@@ -999,7 +999,7 @@
loadAndDecompressPic(rm, drawSurface1, HALF_PAL);
black();
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(0);
if (roomMusic != 0)
playMusic(roomMusic);
@@ -1175,7 +1175,7 @@
copyRectClip(pos_cabina, backSurface, screenSurface);
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
stopSound();
@@ -1251,11 +1251,11 @@
loadAndDecompressPic("99.alg", backSurface, 1);
sentido_hare = 2;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(78);
sentido_hare = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(22);
talk(406);
lleva_vb(98);
@@ -1295,7 +1295,7 @@
lleva_al_hare(79, 165);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("an35_1.alg", backSurface, 1);
loadAndDecompressPic("an35_2.alg", frontSurface, 1);
@@ -1307,7 +1307,7 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(19);
@@ -1400,7 +1400,7 @@
characterMoved = 0;
flags[3] = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
flags[1] = 0;
@@ -1418,7 +1418,7 @@
loadAndDecompressPic("96.alg", frontSurface, 1);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::animation_rayo() {
@@ -1512,7 +1512,7 @@
if (characterMoved == 0)
break;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
sentido_hare = 1;
@@ -1537,7 +1537,7 @@
void DrasculaEngine::animation_4_5() {
flags[7] = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(228);
talk_wolf(1);
talk_wolf(2);
@@ -1569,7 +1569,7 @@
lleva_al_hare(hare_x - 19, hare_y + alto_hare);
sentido_hare = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("3an5_1.alg", backSurface, 1);
loadAndDecompressPic("3an5_2.alg", frontSurface, 1);
@@ -1599,7 +1599,7 @@
for (h = 0; h < (200 - 18); h++)
copyBackground(0, 53, 0, h, 320, 19, frontSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("101.alg", drawSurface1, HALF_PAL);
loadAndDecompressPic("3an5_3.alg", backSurface, 1);
@@ -1690,14 +1690,14 @@
playMusic(26);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(27);
animate("rayo1.bin", 23);
playSound(5);
animate("rayo2.bin", 17);
sentido_hare = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
hare_oscuro();
@@ -1740,7 +1740,7 @@
updateRoom();
copyRect(rayo_x[frame], 1, 41, 0, 44, 44, backSurface, screenSurface);
copyRect(frusky_x[frame], 113, 205, 50, 38, 86, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
stopSound_corte();
@@ -1756,7 +1756,7 @@
pause(4);
updateRoom();
copyRect(elfrusky_x[frame], 47, 192, 39, 66, 106, backSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
animate("frel.bin", 16);
@@ -1805,7 +1805,7 @@
pos_frusky[2] = frank_x;
updateRoom();
copyRectClip(pos_frusky, backSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(15);
playMusic(18);
@@ -1816,7 +1816,7 @@
pos_frusky[1] = frus_y[frame];
pos_frusky[2] = frank_x;
copyRectClip( pos_frusky, backSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
frank_x = frank_x - 5;
frame++;
if (frank_x <= -45)
@@ -1842,12 +1842,12 @@
flags[10] = 1;
playSound(7);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
pause(14);
sentido_hare = 3;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk_solo(_textd[_lang][18], "d18.als");
fadeToBlack(1);
}
@@ -1902,14 +1902,14 @@
fadeToBlack(1);
clearRoom();
loadAndDecompressPic("time1.alg", screenSurface, 1);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(930);
clearRoom();
black();
hare_se_ve = 0;
flags[0] = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(1);
talk(256);
talk_dr_dch(30);
@@ -1917,12 +1917,12 @@
fadeToBlack(0);
clearRoom();
loadAndDecompressPic("time1.alg", screenSurface,1);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(900);
clearRoom();
black();
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(1);
talk(258);
talk_dr_dch(31);
@@ -1976,7 +1976,7 @@
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(2);
}
@@ -2037,13 +2037,13 @@
sentido_hare = 1;
hare_x -= 21;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
fadeFromBlack(0);
pause(96);
lleva_al_hare(116, 178);
sentido_hare = 2;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
playMusic(9);
clearRoom();
loadAndDecompressPic("nota.alg", drawSurface1, COMPLETE_PAL);
@@ -2065,13 +2065,13 @@
talk(300);
updateRoom();
copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
color_abc(kColorLightGreen);
talk_solo("GOOOOOOOOOOOOOOOL", "s15.als");
loadAndDecompressPic("nota2.alg", drawSurface1, 1);
sentido_hare = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(301);
v_cd = _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / 16;
v_cd = v_cd + 4;
@@ -2093,7 +2093,7 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyBackground(164, 85, 155, 48, 113, 114, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
talk_taber2(23);
flags[7] = 1;
@@ -2140,10 +2140,10 @@
updateRefresh_pre();
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(6);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
playSound(4);
pause(6);
stopSound();
@@ -2169,7 +2169,7 @@
copyBackground(49, 139, 228, 112, 47, 60, extraSurface, screenSurface);
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
stopMusic();
@@ -2205,7 +2205,7 @@
copyBackground(49, 139, 228, 112, 47, 60, extraSurface, screenSurface);
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
stopMusic();
@@ -2301,7 +2301,7 @@
sentido_hare=2;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
playSound(13);
stopSound();
sentido_hare = 1;
@@ -2369,7 +2369,7 @@
void DrasculaEngine::animation_34_2() {
sentido_hare = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("an34_1.alg", backSurface, 1);
loadAndDecompressPic("an34_2.alg", extraSurface, 1);
@@ -2423,7 +2423,7 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
updateAnim2(1, 80, 64, 51, 73, 6, backSurface);
updateAnim2(75, 80, 64, 51, 73, 6, backSurface);
@@ -2472,7 +2472,7 @@
void DrasculaEngine::animation_5_2() {
sentido_hare = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
loadAndDecompressPic("an5_1.alg", backSurface, 1);
loadAndDecompressPic("an5_2.alg", extraSurface, 1);
@@ -2480,7 +2480,7 @@
loadAndDecompressPic("an5_4.alg", drawSurface3, 1);
copyBackground(1, 1, 213, 66, 53,84, backSurface, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
// FIXME: the widths in these calls were 53 and 52 (by mistake, probably).
// I've set them to 53, but if any problems arise, we should try 52 as well
@@ -2522,7 +2522,7 @@
loadAndDecompressPic("ciego5.alg", frontSurface, 1);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(1);
@@ -2534,7 +2534,7 @@
talk_hacker(_textd[_lang][67], "d67.als");
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(10);
@@ -2573,7 +2573,7 @@
textSurface = frontSurface;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(10);
@@ -2586,7 +2586,7 @@
talk_hacker(_textd[_lang][65], "d65.als");
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(14);
@@ -2624,7 +2624,7 @@
copyBackground(182, 133, 199, 95, 50, 66, drawSurface3, screenSurface);
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
flags[18] = 1;
@@ -2648,7 +2648,7 @@
copyBackground(182, 133, 199, 95, 50, 66, drawSurface3, screenSurface);
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
flags[18] = 1;
flags[20] = 1;
@@ -2670,14 +2670,14 @@
lleva_al_hare(38, 177);
hare_se_ve = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(800);
animate("bio.bin", 14);
flags[29] = 1;
hare_x = 95;
hare_y = 82;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
openDoor(2, 0);
loadAndDecompressPic("auxigor.alg", frontSurface, 1);
x_igor = 100;
@@ -2704,7 +2704,7 @@
x_igor = 104;
y_igor = 71;
placeIgor();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(40);
talk_igor_front(26);
roomNumber = prevRoom;
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-31 10:24:45 UTC (rev 32423)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-31 12:40:02 UTC (rev 32424)
@@ -587,7 +587,7 @@
}
moveCursor();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (currentChapter == 2) {
if (musicStatus() == 0 && roomMusic != 0)
@@ -694,14 +694,14 @@
} else if (key == Common::KEYCODE_v) {
withVoices = 1;
print_abc(_textsys[_lang][2], 96, 86);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(1410);
if (currentChapter != 3)
cont_sv = 0;
} else if (key == Common::KEYCODE_t) {
withVoices = 0;
print_abc(_textsys[_lang][3], 94, 86);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(1460);
if (currentChapter != 3)
cont_sv = 0;
@@ -1074,7 +1074,7 @@
hare_x = sitio_x;
hare_y = sitio_y;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
return;
}
}
@@ -1084,7 +1084,7 @@
for (;;) {
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (characterMoved == 0)
break;
}
@@ -1094,7 +1094,7 @@
sentido_hare = sentido_final;
}
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::moveCursor() {
@@ -1332,7 +1332,7 @@
setCursorTable();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
updateEvents();
@@ -1414,7 +1414,7 @@
}
print_abc(select, 117, 15);
setCursorTable();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
y = 27;
updateEvents();
@@ -1491,7 +1491,7 @@
else if (hay_seleccion == 0) {
print_abc("elige una partida", 117, 15);
}
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(400);
}
y = 26;
@@ -1609,7 +1609,7 @@
color_abc(kColorRed);
updateRoom();
centerText(_textsys[_lang][1], 160, 87);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
delay(100);
for (;;) {
@@ -2038,7 +2038,7 @@
} while (counter > 0);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::stopSound() {
@@ -2461,7 +2461,7 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
sentido_hare = sentidobj[l];
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
characterMoved = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
@@ -2518,7 +2518,7 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
sentido_hare = sentidobj[l];
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
characterMoved = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
@@ -2536,7 +2536,7 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
sentido_hare = sentidobj[l];
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
characterMoved = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
@@ -2557,7 +2557,7 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
sentido_hare = sentidobj[l];
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
characterMoved = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
@@ -2576,7 +2576,7 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
sentido_hare = sentidobj[l];
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
characterMoved = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
@@ -2603,7 +2603,7 @@
updateRoom();
showMenu();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
// Objects with an ID smaller than 7 are the inventory verbs
if (pickedObject >= 7) {
@@ -2649,7 +2649,7 @@
select2[v] = '-';
copyBackground(115, 14, 115, 14, 176, 9, drawSurface1, screenSurface);
print_abc(select2, 117, 15);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
key = getScan();
delay(70);
if (key != 0) {
@@ -3265,7 +3265,7 @@
print_abc_opc(phrase3, 1, 18, game3);
print_abc_opc(phrase4, 1, 26, game4);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if ((button_izq == 1) && (game1 == 2)) {
delay(100);
@@ -3601,7 +3601,7 @@
for (;;) {
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (sentido_vb == 0) {
vb_x = vb_x - 5;
if (vb_x <= pointX)
@@ -3650,7 +3650,7 @@
} while (counter > 0);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::openDoor(int nflag, int doorNum) {
@@ -3668,7 +3668,7 @@
if (doorNum != NO_DOOR)
updateDoor(doorNum);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
withoutVerb();
}
@@ -3713,12 +3713,12 @@
if (withVoices == 0)
centerText(".groaaarrrrgghhh!", 153, 65);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::activatePendulum() {
@@ -3742,7 +3742,7 @@
if (doorNum != NO_DOOR)
updateDoor(doorNum);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
withoutVerb();
}
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-31 10:24:45 UTC (rev 32423)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-31 12:40:02 UTC (rev 32424)
@@ -192,6 +192,9 @@
void copyRect(int xorg, int yorg, int xdes, int ydes, int width,
int height, byte *src, byte *dest);
void copyRectClip(int *Array, byte *src, byte *dest);
+ void updateScreen() {
+ updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ }
void updateScreen(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *buffer);
int checkWrapX(int x) {
if (x < 0) x += 320;
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-05-31 10:24:45 UTC (rev 32423)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-05-31 12:40:02 UTC (rev 32424)
@@ -103,7 +103,7 @@
} else if (pickedObject == kVerbTalk && fl == 133) {
talk_sinc(_text[_lang][322], "322.als", "13333334125433333333");
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(25);
talk(33);
} else if (pickedObject == kVerbLook && fl == 165) {
@@ -114,7 +114,7 @@
updateRefresh_pre();
copyRect(44, 1, hare_x, hare_y, 41, 70, drawSurface2, screenSurface);
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(4);
pickObject(10);
flags[3] = 1;
@@ -173,42 +173,42 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyRect(228, 102, hare_x + 5, hare_y - 1, 47, 73, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(10);
playSound(3);
flags[2] = 1;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
} else if (pickedObject == kVerbClose && fl == 143 && flags[2] == 1) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
flags[2] = 0;
updateRefresh_pre();
copyRect(228, 102, hare_x + 5, hare_y - 1, 47, 73, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(5);
playSound(4);
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
} else if (pickedObject == kVerbOpen && fl == 139 && flags[1] == 0) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyRect(267, 1, hare_x - 14, hare_y - 2, 52, 73, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(19);
playSound(3);
flags[1] = 1;
visible[4] = 1;
visible[2] = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
stopSound();
} else if (pickedObject == kVerbPick && fl == 140) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyRect(267, 1, hare_x - 14, hare_y - 2, 52, 73, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(19);
pickObject(9);
visible[4] = 0;
@@ -332,7 +332,7 @@
} else if (pickedObject == 18 && fl == 188 && flags[26] == 0) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
copyRect(133, 135, hare_x + 6, hare_y, 39, 63, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
playSound(8);
stopSound();
talk(338);
@@ -380,7 +380,7 @@
flags[20] = 1;
sentido_hare = 3;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(342);
pickObject(22);
}
@@ -398,7 +398,7 @@
talk(343);
sentido_hare = 3;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talk(344);
} else if (pickedObject == kVerbTalk && fl == 187)
talk(345);
@@ -442,7 +442,7 @@
updateRefresh_pre();
copyRect(44, 1, hare_x, hare_y, 41, 70, drawSurface2, screenSurface);
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(4);
pickObject(12);
visible[2] = 0;
@@ -461,12 +461,12 @@
else if (pickedObject == 11 && fl == 50 && flags[22] == 0) {
sentido_hare = 3;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyRect(1, 1, hare_x - 1, hare_y + 3, 42, 67, drawSurface2, screenSurface);
updateRefresh();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(6);
talk(347);
flags[29] = 1;
@@ -925,7 +925,7 @@
lleva_al_hare(174, 168);
sentido_hare = 2;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(40);
playSound(12);
pause(19);
@@ -934,7 +934,7 @@
updateRoom();
copyRect(101, 34, hare_x - 4, hare_y - 1, 37, 70, drawSurface3, screenSurface);
copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
hare_se_ve = 1;
clearRoom();
loadAndDecompressPic("tlef0.alg", drawSurface1, COMPLETE_PAL);
@@ -1803,7 +1803,7 @@
bool DrasculaEngine::checkFlag(int fl) {
characterMoved = 0;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
hasAnswer = 1;
Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp 2008-05-31 10:24:45 UTC (rev 32423)
+++ scummvm/trunk/engines/drascula/talk.cpp 2008-05-31 12:40:02 UTC (rev 32424)
@@ -94,7 +94,7 @@
if (withVoices == 0)
centerText(said, x_igor + 26, y_igor);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
@@ -103,7 +103,7 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_dr_izq(int index) {
@@ -144,7 +144,7 @@
if (withVoices == 0)
centerText(said, x_dr + 19, y_dr);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
@@ -153,7 +153,7 @@
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
placeIgor();
placeDrascula();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_dr_dch(int index) {
@@ -193,7 +193,7 @@
if (withVoices == 0)
centerText(said, x_dr + 19, y_dr);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
@@ -206,7 +206,7 @@
placeDrascula();
if (currentChapter == 6)
pon_hare();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_solo(const char *said, const char *filename) {
@@ -231,12 +231,12 @@
else if (currentChapter == 5)
centerText(said, 173, 92);
}
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
} while (!isTalkFinished(&length));
if (currentChapter == 6) {
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
}
@@ -275,7 +275,7 @@
if (withVoices == 0)
centerText(said, x_igor + 26, y_igor);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
@@ -289,7 +289,7 @@
placeIgor();
placeDrascula();
}
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_bartender(int index) {
@@ -329,14 +329,14 @@
if (withVoices == 0)
centerText(said, 132, 45);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_bj(int index) {
@@ -373,7 +373,7 @@
if (withVoices == 0)
centerText(said, x_bj + 7, y_bj);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} else {
@@ -382,12 +382,12 @@
if (withVoices == 0)
centerText(said, 93, 80);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk(int index) {
@@ -500,13 +500,13 @@
if (withVoices == 0)
centerText(said, hare_x, hare_y);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (currentChapter == 1) {
if (musicStatus() == 0 && flags[11] == 0 && musicStopped == 0)
@@ -544,13 +544,13 @@
if (withVoices == 0)
centerText(said, 221, 128);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_drunk(int index) {
@@ -572,7 +572,7 @@
while (flags[12] == 1) {
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
color_abc(kColorDarkGreen);
@@ -593,13 +593,13 @@
if (withVoices == 0)
centerText(said, 181, 54);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
flags[13] = 0;
if (currentChapter == 1) {
@@ -648,13 +648,13 @@
if (withVoices == 0)
centerText(said, vb_x, 66);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0)
playMusic(roomMusic);
}
@@ -678,11 +678,11 @@
if (withVoices == 0)
centerText(said, 150, 80);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0)
playMusic(roomMusic);
}
@@ -696,7 +696,7 @@
color_abc(kColorBrown);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
talkInit(filename);
@@ -732,7 +732,7 @@
if (withVoices == 0)
centerText(said, 310, 71);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(2);
p++;
} while (!isTalkFinished(&length));
@@ -742,7 +742,7 @@
int length = strlen(said);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
color_abc(kColorYellow);
@@ -751,7 +751,7 @@
do {
if (withVoices == 0)
centerText(said, 156, 170);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
} while (!isTalkFinished(&length));
}
@@ -784,13 +784,13 @@
if (withVoices == 0)
centerText(said, 203, 78);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_mus(int index) {
@@ -822,14 +822,14 @@
if (withVoices == 0)
centerText(said, 197, 64);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_pen(const char *said, const char *filename) {
@@ -841,7 +841,7 @@
updateRoom();
copyRect(44, 145, 145, 105, 25, 29, drawSurface3, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
color_abc(kColorYellow);
@@ -861,7 +861,7 @@
if (withVoices == 0)
centerText(said, 160, 105);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
@@ -869,7 +869,7 @@
flags[1] = 0;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_pen2(const char *said, const char *filename) {
@@ -897,7 +897,7 @@
if (withVoices == 0)
centerText(said, 195, 107);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
@@ -905,7 +905,7 @@
flags[1] = 0;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_taber2(int index) {
@@ -937,13 +937,13 @@
if (withVoices == 0)
centerText(said, 132, 45);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_bj_bed(int index) {
@@ -976,13 +976,13 @@
if (withVoices == 0)
centerText(said, 104, 102);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_htel(int index) {
@@ -1019,12 +1019,12 @@
if (withVoices == 0)
centerText(said, 90, 50);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_sinc(const char *said, const char *filename, const char *sincronia) {
@@ -1100,7 +1100,7 @@
if (withVoices == 0)
centerText(said, hare_x, hare_y);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
p++;
pause(3);
@@ -1131,14 +1131,14 @@
if (withVoices == 0)
centerText(said, 263, 69);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(4);
} while (!isTalkFinished(&length));
flags[19] = cara_antes;
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_igor_door(int index) {
@@ -1158,11 +1158,11 @@
updateRoom();
if (withVoices == 0)
centerText(said, 87, 66);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_igor_seated(int index) {
@@ -1194,13 +1194,13 @@
if (withVoices == 0)
centerText(said, 221, 102);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_igor_wig(int index) {
@@ -1232,13 +1232,13 @@
if (withVoices == 0)
centerText(said, 221, 102);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
} while (!isTalkFinished(&length));
updateRoom();
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
}
void DrasculaEngine::talk_dr_grande(const char *said, const char *filename) {
@@ -1263,7 +1263,7 @@
if (withVoices == 0)
centerText(said, 191, 69);
- updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
+ updateScreen();
pause(3);
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