[Scummvm-cvs-logs] SF.net SVN: scummvm: [32372] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri May 30 00:34:04 CEST 2008
Revision: 32372
http://scummvm.svn.sourceforge.net/scummvm/?rev=32372&view=rev
Author: thebluegr
Date: 2008-05-29 15:34:03 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Loads of Spanish translations with the help of timofonic (thanks!).
Unified some variable styles
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-29 22:07:25 UTC (rev 32371)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-29 22:34:03 UTC (rev 32372)
@@ -37,52 +37,52 @@
while (term_int == 0) {
playMusic(29);
fliplay("logoddm.bin", 9);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(600);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
delay(340);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
playMusic(26);
delay(500);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
fliplay("logoalc.bin", 8);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("cielo.alg");
decompressPic(dir_zona_pantalla, 256);
black();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(2);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ fadeFromBlack(2);
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(900);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
color_abc(RED);
- centra_texto(_textmisc[_lang][1], 160, 100);
+ centerText(_textmisc[_lang][1], 160, 100);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(1000);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(1200);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
fliplay("scrollb.bin", 9);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
playSound("s5.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("scr2.bin", 17))
break;
@@ -92,10 +92,10 @@
loadPic("cielo2.alg");
decompressPic(dir_zona_pantalla, 256);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- FundeAlNegro(1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ fadeToBlack(1);
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
@@ -109,10 +109,10 @@
decompressPic(dir_dibujo2, 1);
playMusic(4);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
delay(400);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
for (l2 = 0; l2 < 3; l2++)
@@ -120,13 +120,13 @@
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
copyBackground(interf_x[l], interf_y[l], 156, 45, 63, 31, dir_dibujo2, dir_zona_pantalla);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- if (getscan() == Common::KEYCODE_ESCAPE) {
+ if (getScan() == Common::KEYCODE_ESCAPE) {
term_int = 1;
break;
}
pause(3);
}
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
l2 = 0; p = 0;
@@ -151,17 +151,17 @@
}
if (l2 == 7)
l2 = 0;
- if (getscan() == Common::KEYCODE_ESCAPE) {
+ if (getScan() == Common::KEYCODE_ESCAPE) {
term_int = 1;
break;
}
}
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
copyBackground(0, 0, 0, 0, 320, 200, dir_zona_pantalla, dir_dibujo1);
talk_dr_grande(_textd[_lang][1], "D1.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
@@ -180,21 +180,21 @@
y_igor = 97;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_igor_dch(8);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_dr_izq(2);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_dr_izq(3);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("lib.bin", 16))
break;
@@ -207,13 +207,13 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(10);
talk_solo(_textd[_lang][4],"d4.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadPic("plan1.alg");
decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_solo(_textd[_lang][5], "d5.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("lib2.bin", 16))
break;
@@ -223,7 +223,7 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(20);
talk_solo(_textd[_lang][6], "d6.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("lib2.bin", 16))
break;
@@ -232,36 +232,36 @@
decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(20);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_solo(_textd[_lang][7], "d7.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadPic("plan3.alg");
decompressPic(dir_zona_pantalla, HALF_PAL);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_solo(_textd[_lang][8], "d8.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("100.alg");
decompressPic(dir_dibujo1, HALF_PAL);
MusicFadeout();
stopMusic();
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(9);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_dr_izq(9);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(10);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
playMusic(11);
talk_dr_izq(10);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("rayo1.bin", 16))
break;
@@ -278,89 +278,89 @@
clearRoom();
black();
playMusic(23);
- FundeDelNegro(0);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ fadeFromBlack(0);
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_dr = 1;
talk_igor_dch(1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_dr_dch(11);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_dr = 3;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(1);
sentido_dr = 0;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_dr_izq(12);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_dr = 3;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(1);
sentido_dr = 1;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_igor_dch(2);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(13);
talk_dr_dch(13);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_dr = 3;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(1);
sentido_dr = 0;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
- pon_igor();
- pon_dr();
+ placeIgor();
+ placeDrascula();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_dr_izq(14);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(3);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_dr_izq(15);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(4);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_dr_izq(16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_dch(5);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_igor = 3;
talk_dr_izq(17);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(18);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_igor_frente(_texti[_lang][6], "I6.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- FundeAlNegro(0);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ fadeToBlack(0);
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
@@ -408,13 +408,13 @@
l = 0;
if (withVoices == 0)
- centra_texto(said, 191, 69);
+ centerText(said, 191, 69);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(3);
- byte key = getscan();
+ byte key = getScan();
if (key == Common::KEYCODE_ESCAPE)
term_int = 1;
@@ -442,7 +442,7 @@
term_int = 0;
for (;;) {
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("ag.bin", 14))
@@ -453,11 +453,11 @@
loadPic("an11y13.alg");
decompressPic(dir_hare_dch, 1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_tabernero(22);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (_lang == kSpanish)
@@ -465,56 +465,56 @@
loadPic("97.alg");
decompressPic(dir_hare_dch, 1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(4);
playSound("s1.als");
- hipo(18);
+ hiccup(18);
stopSound();
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
stopMusic();
- corta_musica = 1;
+ musicStopped = 1;
memset(dir_zona_pantalla, 0, 64000);
color_solo = WHITE;
pause(80);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_solo(_textbj[_lang][1], "BJ1.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("bj.alg");
decompressPic(dir_zona_pantalla, HALF_PAL);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
black();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ fadeFromBlack(1);
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
color_solo = YELLOW;
talk_solo(_text[_lang][214], "214.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
loadPic("16.alg");
decompressPic(dir_dibujo1, HALF_PAL);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadPic("auxbj.alg");
decompressPic(dir_dibujo3, 1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
roomNumber = 16;
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
for (l = 0; l < 200; l++)
factor_red[l] = 99;
@@ -525,19 +525,19 @@
hare_y = 95;
sentido_hare = 1;
hare_se_ve = 1;
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadPic("97g.alg");
decompressPic(dir_hare_dch, 1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("lev.bin", 15))
break;
lleva_al_hare(100 + ancho_hare / 2, 99 + alto_hare);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_hare = 1;
hare_x = 100;
@@ -566,49 +566,49 @@
break;
playMusic(9);
loadPic("97.alg");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
decompressPic(dir_hare_dch, 1);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(120);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_solo(_text[_lang][223], "223.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
color_solo = WHITE;
updateRoom();
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(110);
talk_solo(_textbj[_lang][11], "BJ11.als");
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateRoom();
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(118);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
lleva_al_hare(132, 97 + alto_hare);
pause(60);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk(224);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk_bj(12);
lleva_al_hare(157, 98 + alto_hare);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
if (anima("bes.bin", 16))
break;
@@ -625,28 +625,28 @@
// Also check animation_9_6(), where the same hack was used by
// the original
roomNumber = -1;
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
pause(8);
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk(225);
pause(76);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
sentido_hare = 1;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk(226);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(30);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
talk(227);
- FundeAlNegro(0);
+ fadeToBlack(0);
break;
}
}
@@ -838,15 +838,15 @@
pause(8);
clearRoom();
- loadPic("ciego1.alg");
+ loadPic("blind1.alg");
decompressPic(dir_dibujo1, HALF_PAL);
- loadPic("ciego2.alg");
+ loadPic("blind2.alg");
decompressPic(dir_dibujo3, 1);
- loadPic("ciego3.alg");
+ loadPic("blind3.alg");
decompressPic(dir_hare_dch, 1);
- loadPic("ciego4.alg");
+ loadPic("blind4.alg");
decompressPic(dir_hare_fondo, 1);
- loadPic("ciego5.alg");
+ loadPic("blind5.alg");
decompressPic(dir_hare_frente, 1);
if (_lang == kSpanish)
@@ -857,30 +857,30 @@
pause(10);
- talk_ciego(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
+ talk_blind(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
pause(5);
talk_hacker(_textd[_lang][57], "d57.als");
pause(6);
- talk_ciego(_textd[_lang][69],"d69.als", _textd1[_lang][69 - TEXTD_START]);
+ talk_blind(_textd[_lang][69],"d69.als", _textd1[_lang][69 - TEXTD_START]);
pause(4);
talk_hacker(_textd[_lang][58],"d58.als");
- talk_ciego(_textd[_lang][70],"d70.als", _textd1[_lang][70 - TEXTD_START]);
+ talk_blind(_textd[_lang][70],"d70.als", _textd1[_lang][70 - TEXTD_START]);
delay(14);
talk_hacker(_textd[_lang][59],"d59.als");
- talk_ciego(_textd[_lang][71],"d71.als", _textd1[_lang][71 - TEXTD_START]);
+ talk_blind(_textd[_lang][71],"d71.als", _textd1[_lang][71 - TEXTD_START]);
talk_hacker(_textd[_lang][60],"d60.als");
- talk_ciego(_textd[_lang][72],"d72.als", _textd1[_lang][72 - TEXTD_START]);
+ talk_blind(_textd[_lang][72],"d72.als", _textd1[_lang][72 - TEXTD_START]);
talk_hacker(_textd[_lang][61],"d61.als");
- talk_ciego(_textd[_lang][73],"d73.als", _textd1[_lang][73 - TEXTD_START]);
+ talk_blind(_textd[_lang][73],"d73.als", _textd1[_lang][73 - TEXTD_START]);
talk_hacker(_textd[_lang][62],"d62.als");
- talk_ciego(_textd[_lang][74],"d74.als", _textd1[_lang][74 - TEXTD_START]);
+ talk_blind(_textd[_lang][74],"d74.als", _textd1[_lang][74 - TEXTD_START]);
talk_hacker(_textd[_lang][63],"d63.als");
- talk_ciego(_textd[_lang][75],"d75.als", _textd1[_lang][75 - TEXTD_START]);
+ talk_blind(_textd[_lang][75],"d75.als", _textd1[_lang][75 - TEXTD_START]);
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
_system->delayMillis(1000);
talk_hacker(_textd[_lang][64], "d64.als");
- talk_ciego(_textd[_lang][76], "d76.als", _textd1[_lang][76 - TEXTD_START]);
+ talk_blind(_textd[_lang][76], "d76.als", _textd1[_lang][76 - TEXTD_START]);
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
@@ -967,7 +967,7 @@
decompressPic(dir_dibujo1, 1);
playSound("s7.als");
- hipo(15);
+ hiccup(15);
stopSound();
@@ -976,17 +976,17 @@
}
void DrasculaEngine::animation_15_2() {
- talk_borracho(_textb[_lang][8], "B8.als");
+ talk_drunk(_textb[_lang][8], "B8.als");
pause(7);
- talk_borracho(_textb[_lang][9], "B9.als");
- talk_borracho(_textb[_lang][10], "B10.als");
- talk_borracho(_textb[_lang][11], "B11.als");
+ talk_drunk(_textb[_lang][9], "B9.als");
+ talk_drunk(_textb[_lang][10], "B10.als");
+ talk_drunk(_textb[_lang][11], "B11.als");
}
void DrasculaEngine::animation_16_2() {
int l;
- talk_borracho(_textb[_lang][12], "B12.als");
+ talk_drunk(_textb[_lang][12], "B12.als");
talk(_text[_lang][371], "371.als");
clearRoom();
@@ -996,7 +996,7 @@
else
playMusic(32);
- int key = getscan();
+ int key = getScan();
if (key != 0)
goto asco;
@@ -1012,14 +1012,14 @@
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
if (_lang != kSpanish)
- centra_texto(_texthis[_lang][1], 180, 180);
+ centerText(_texthis[_lang][1], 180, 180);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
if (_lang == kSpanish)
- FundeDelNegro(1);
+ fadeFromBlack(1);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
@@ -1028,12 +1028,12 @@
else
_system->delayMillis(4000);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
- FundeAlNegro(1);
- key = getscan();
+ fadeToBlack(1);
+ key = getScan();
if (key != 0)
goto asco;
@@ -1043,10 +1043,10 @@
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
if (_lang != kSpanish)
- centra_texto(_texthis[_lang][2], 180, 180);
+ centerText(_texthis[_lang][2], 180, 180);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
@@ -1055,12 +1055,12 @@
else
_system->delayMillis(4000);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
- FundeAlNegro(1);
- key = getscan();
+ fadeToBlack(1);
+ key = getScan();
if (key != 0)
goto asco;
@@ -1070,10 +1070,10 @@
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
if (_lang != kSpanish)
- centra_texto(_texthis[_lang][3], 180, 180);
+ centerText(_texthis[_lang][3], 180, 180);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
@@ -1082,11 +1082,11 @@
else
_system->delayMillis(4000);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
- FundeAlNegro(1);
+ fadeToBlack(1);
clearRoom();
loadPic("his4_1.alg");
@@ -1097,10 +1097,10 @@
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo3, dir_zona_pantalla);
if (_lang != kSpanish)
- centra_texto(_texthis[_lang][1], 180, 180);
+ centerText(_texthis[_lang][1], 180, 180);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
@@ -1109,7 +1109,7 @@
else
_system->delayMillis(4000);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
@@ -1117,13 +1117,13 @@
copyBackground(0, 0, 0, l, 320, 200 - l, dir_dibujo3, dir_zona_pantalla);
copyBackground(0, 200 - l, 0, 0, 320, l, dir_dibujo1, dir_zona_pantalla);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- key = getscan();
+ key = getScan();
if (key != 0)
goto asco;
}
pause(5);
- FundeAlNegro(2);
+ fadeToBlack(2);
clearRoom();
asco:
@@ -1136,7 +1136,7 @@
black();
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(0);
+ fadeFromBlack(0);
if (roomMusic != 0)
playMusic(roomMusic);
else
@@ -1144,8 +1144,8 @@
}
void DrasculaEngine::animation_17_2() {
- talk_borracho(_textb[_lang][13], "B13.als");
- talk_borracho(_textb[_lang][14], "B14.als");
+ talk_drunk(_textb[_lang][13], "B13.als");
+ talk_drunk(_textb[_lang][14], "B14.als");
flags[40] = 1;
}
@@ -1171,9 +1171,9 @@
flags[18] = 0;
flags[14] = 1;
openDoor(15, 1);
- sal_de_la_habitacion(1);
+ exitRoom(1);
animation_23_2();
- sal_de_la_habitacion(0);
+ exitRoom(0);
flags[21] = 0;
flags[24] = 0;
sentido_vb = 1;
@@ -1228,11 +1228,11 @@
talk_vb(19);
if (flags[25] == 0) {
talk_vb(20);
- if (resta_objeto(7) == 0)
+ if (removeObject(7) == 0)
flags[30] = 1;
- if (resta_objeto(18) == 0)
+ if (removeObject(18) == 0)
flags[31] = 1;
- if (resta_objeto(19) == 0)
+ if (removeObject(19) == 0)
flags[32] = 1;
}
talk_vb(21);
@@ -1331,17 +1331,17 @@
flags[22] = 1;
withoutVerb();
- resta_objeto(23);
- suma_objeto(11);
+ removeObject(23);
+ addObject(11);
talk_vb(23);
talk_vb(24);
if (flags[30] == 1)
- suma_objeto(7);
+ addObject(7);
if (flags[31] == 1)
- suma_objeto(18);
+ addObject(18);
if (flags[32] == 1)
- suma_objeto(19);
+ addObject(19);
talk_vb(25);
talk_vb(26);
}
@@ -1429,12 +1429,12 @@
flags[38] = 0;
flags[36] = 1;
withoutVerb();
- resta_objeto(8);
- resta_objeto(13);
- resta_objeto(15);
- resta_objeto(16);
- resta_objeto(17);
- suma_objeto(20);
+ removeObject(8);
+ removeObject(13);
+ removeObject(15);
+ removeObject(16);
+ removeObject(17);
+ addObject(20);
}
void DrasculaEngine::animation_35_2() {
@@ -1500,7 +1500,7 @@
pause(10);
- FundeAlNegro(2);
+ fadeToBlack(2);
}
void DrasculaEngine::animation_1_3() {
@@ -1825,37 +1825,37 @@
}
void DrasculaEngine::animation_2_4() {
- talk_igor_sentado(_texti[_lang][16], "I16.als");
+ talk_igor_seated(_texti[_lang][16], "I16.als");
talk(_text[_lang][278], "278.als");
- talk_igor_sentado(_texti[_lang][17], "I17.als");
+ talk_igor_seated(_texti[_lang][17], "I17.als");
talk(_text[_lang][279], "279.als");
- talk_igor_sentado(_texti[_lang][18], "I18.als");
+ talk_igor_seated(_texti[_lang][18], "I18.als");
}
void DrasculaEngine::animation_3_4() {
- talk_igor_sentado(_texti[_lang][19], "I19.als");
- talk_igor_sentado(_texti[_lang][20], "I20.als");
+ talk_igor_seated(_texti[_lang][19], "I19.als");
+ talk_igor_seated(_texti[_lang][20], "I20.als");
talk(_text[_lang][281], "281.als");
}
void DrasculaEngine::animation_4_4() {
talk(_text[_lang][287], "287.als");
- talk_igor_sentado(_texti[_lang][21], "I21.als");
+ talk_igor_seated(_texti[_lang][21], "I21.als");
talk(_text[_lang][284], "284.als");
- talk_igor_sentado(_texti[_lang][22], "I22.als");
+ talk_igor_seated(_texti[_lang][22], "I22.als");
talk(_text[_lang][285], "285.als");
- talk_igor_sentado(_texti[_lang][23], "I23.als");
+ talk_igor_seated(_texti[_lang][23], "I23.als");
}
void DrasculaEngine::animation_7_4() {
black();
talk(_text[_lang][427], "427.als");
- FundeDelNegro(1);
- resta_objeto(8);
- resta_objeto(10);
- resta_objeto(12);
- resta_objeto(16);
- suma_objeto(17);
+ fadeFromBlack(1);
+ removeObject(8);
+ removeObject(10);
+ removeObject(12);
+ removeObject(16);
+ addObject(17);
flags[30] = 0;
flags[29] = 0;
}
@@ -1879,9 +1879,9 @@
talk(438);
sitio_x = 120;
sitio_y = 157;
- anda_a_objeto = 1;
+ walkToObject = 1;
sentido_final = 1;
- empieza_andar();
+ startWalking();
talk_bj(21);
for (;;) {
@@ -1897,7 +1897,7 @@
}
sentido_hare = 1;
- conversa("op_8.cal");
+ converse("op_8.cal");
}
void DrasculaEngine::animation_2_5() {
@@ -1915,20 +1915,20 @@
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk(_text[_lang][228], "228.als");
- talk_lobo(_textl[_lang][1], "L1.als");
- talk_lobo(_textl[_lang][2], "L2.als");
+ talk_wolf(_textl[_lang][1], "L1.als");
+ talk_wolf(_textl[_lang][2], "L2.als");
pause(23);
talk(_text[_lang][229], "229.als");
- talk_lobo(_textl[_lang][3], "L3.als");
- talk_lobo(_textl[_lang][4], "L4.als");
+ talk_wolf(_textl[_lang][3], "L3.als");
+ talk_wolf(_textl[_lang][4], "L4.als");
talk(_text[_lang][230], "230.als");
- talk_lobo(_textl[_lang][5], "L5.als");
+ talk_wolf(_textl[_lang][5], "L5.als");
talk(_text[_lang][231], "231.als");
- talk_lobo(_textl[_lang][6], "L6.als");
- talk_lobo(_textl[_lang][7], "L7.als");
+ talk_wolf(_textl[_lang][6], "L6.als");
+ talk_wolf(_textl[_lang][7], "L7.als");
pause(33);
talk(_text[_lang][232], "232.als");
- talk_lobo(_textl[_lang][8], "L8.als");
+ talk_wolf(_textl[_lang][8], "L8.als");
}
void DrasculaEngine::animation_5_5(){
@@ -1940,7 +1940,7 @@
int pixel_x = hare_x - 53, pixel_y = hare_y - 9;
withoutVerb();
- resta_objeto(8);
+ removeObject(8);
lleva_al_hare(hare_x - 19, hare_y + alto_hare);
sentido_hare = 1;
@@ -2016,38 +2016,38 @@
}
void DrasculaEngine::animation_6_5() {
- talk_lobo(_textl[_lang][9], "L9.als");
+ talk_wolf(_textl[_lang][9], "L9.als");
talk(_text[_lang][234], "234.als");
}
void DrasculaEngine::animation_7_5() {
- talk_lobo(_textl[_lang][10], "L10.als");
+ talk_wolf(_textl[_lang][10], "L10.als");
talk(_text[_lang][236], "236.als");
- talk_lobo(_textl[_lang][11], "L11.als");
- talk_lobo(_textl[_lang][12], "L12.als");
- talk_lobo(_textl[_lang][13], "L13.als");
+ talk_wolf(_textl[_lang][11], "L11.als");
+ talk_wolf(_textl[_lang][12], "L12.als");
+ talk_wolf(_textl[_lang][13], "L13.als");
pause(34);
- talk_lobo(_textl[_lang][14], "L14.als");
+ talk_wolf(_textl[_lang][14], "L14.als");
}
void DrasculaEngine::animation_8_5() {
- talk_lobo(_textl[_lang][15], "L15.als");
+ talk_wolf(_textl[_lang][15], "L15.als");
talk(_text[_lang][238], "238.als");
- talk_lobo(_textl[_lang][16], "L16.als");
+ talk_wolf(_textl[_lang][16], "L16.als");
}
void DrasculaEngine::animation_9_5() {
flags[4] = 1;
talk(_text[_lang][401], "401.als");
withoutVerb();
- resta_objeto(15);
+ removeObject(15);
}
void DrasculaEngine::animation_10_5() {
flags[3] = 1;
talk(_text[_lang][401], "401.als");
withoutVerb();
- resta_objeto(12);
+ removeObject(12);
}
void DrasculaEngine::animation_11_5() {
@@ -2154,7 +2154,7 @@
animation_13_5();
playSound("s1.als");
- hipo(12);
+ hiccup(12);
stopSound();
loadPic("99.alg");
@@ -2170,7 +2170,7 @@
sentido_hare = 1;
hare_se_mueve = 0;
hare_x = -1;
- obj_saliendo = 104;
+ objExit = 104;
withoutVerb();
carga_escoba("57.ald");
}
@@ -2237,7 +2237,7 @@
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
talk_solo(_textd[_lang][18], "d18.als");
- FundeAlNegro(1);
+ fadeToBlack(1);
}
void DrasculaEngine::animation_15_5() {
@@ -2280,7 +2280,7 @@
talk_dr_dch(22);
talk(249);
talk_dr_dch(23);
- conversa("op_11.cal");
+ converse("op_11.cal");
talk_dr_dch(26);
anima("fum.bin", 15);
@@ -2290,7 +2290,7 @@
talk_dr_dch(28);
talk(255);
talk_dr_dch(29);
- FundeAlNegro(1);
+ fadeToBlack(1);
clearRoom();
loadPic("time1.alg");
decompressPic(dir_zona_pantalla, 1);
@@ -2302,11 +2302,11 @@
flags[0] = 0;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(1);
+ fadeFromBlack(1);
talk(256);
talk_dr_dch(30);
talk(257);
- FundeAlNegro(0);
+ fadeToBlack(0);
clearRoom();
loadPic("time1.alg");
decompressPic(dir_zona_pantalla,1);
@@ -2316,7 +2316,7 @@
black();
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(1);
+ fadeFromBlack(1);
talk(258);
talk_dr_dch(31);
animation_5_6();
@@ -2334,7 +2334,7 @@
clearRoom();
carga_escoba("102.ald");
- activa_pendulo();
+ activatePendulum();
}
void DrasculaEngine::animation_2_6() {
@@ -2380,7 +2380,7 @@
anima("rct.bin", 11);
clearRoom();
withoutVerb();
- resta_objeto(20);
+ removeObject(20);
loadPic("96.alg");
decompressPic(dir_hare_frente, 1);
loadPic("97.alg");
@@ -2390,7 +2390,7 @@
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
rompo = 1;
- obj_saliendo = 104;
+ objExit = 104;
hare_x = -1;
withoutVerb();
carga_escoba("58.ald");
@@ -2416,10 +2416,10 @@
playMusic(13);
flags[5] = 1;
anima("drf.bin", 16);
- FundeAlNegro(0);
+ fadeToBlack(0);
clearRoom();
hare_x = -1;
- obj_saliendo = 108;
+ objExit = 108;
carga_escoba("59.ald");
// The room number was originally changed here to "nada.alg",
// which is a non-existant file. In reality, this was just a
@@ -2436,7 +2436,7 @@
hare_x -= 21;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- FundeDelNegro(0);
+ fadeFromBlack(0);
pause(96);
lleva_al_hare(116, 178);
sentido_hare = 2;
@@ -2478,7 +2478,7 @@
v_cd = _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / 16;
v_cd = v_cd + 4;
playMusic(17);
- FundeAlNegro(1);
+ fadeToBlack(1);
clearRoom();
fliplay("qpc.bin", 1);
MusicFadeout();
@@ -2520,7 +2520,7 @@
void DrasculaEngine::animation_14_6() {
talk_taber2(_textt[_lang][24], "t24.als");
- suma_objeto(21);
+ addObject(21);
flags[10] = 1;
rompo_y_salgo = 1;
}
@@ -2532,7 +2532,7 @@
void DrasculaEngine::animation_18_6() {
flags[6] = 1;
withoutVerb();
- resta_objeto(21);
+ removeObject(21);
anima("beb.bin", 10);
}
@@ -2579,7 +2579,7 @@
flags[11] = 1;
talk_pianista(_textp[_lang][5], "P5.als");
- conversa("op_1.cal");
+ converse("op_1.cal");
if (_lang == kSpanish)
dir_texto = dir_hare_dch;
@@ -2656,7 +2656,7 @@
}
pickObject(11);
- resta_objeto(12);
+ removeObject(12);
if (_lang == kSpanish)
dir_texto = dir_hare_dch;
@@ -2698,17 +2698,17 @@
if (flags[41] == 0) {
talk(_text[_lang][103], "103.als");
- talk_borracho(_textb[_lang][4], "B4.als");
+ talk_drunk(_textb[_lang][4], "B4.als");
flags[12] = 1;
talk(_text[_lang][367], "367.als");
- talk_borracho(_textb[_lang][5], "B5.als");
+ talk_drunk(_textb[_lang][5], "B5.als");
flags[12] = 1;
talk(_text[_lang][368], "368.als");
- talk_borracho(_textb[_lang][6], "B6.als");
- talk_borracho(_textb[_lang][7], "B7.als");
+ talk_drunk(_textb[_lang][6], "B6.als");
+ talk_drunk(_textb[_lang][7], "B7.als");
flags[41] = 1;
}
- conversa("op_2.cal");
+ converse("op_2.cal");
loadPic("964.alg");
decompressPic(dir_hare_frente, 1);
@@ -2717,7 +2717,7 @@
void DrasculaEngine::animation_18_2() {
talk(378);
talk_vbpuerta(4);
- conversa("op_3.cal");
+ converse("op_3.cal");
}
void DrasculaEngine::animation_22_2() {
@@ -2759,11 +2759,11 @@
talk_vb(22);
if (flags[22] == 0)
- conversa("op_4.cal");
+ converse("op_4.cal");
else
- conversa("op_5.cal");
+ converse("op_5.cal");
- sal_de_la_habitacion(0);
+ exitRoom(0);
flags[21] = 0;
flags[24] = 0;
sentido_vb = 1;
@@ -3261,15 +3261,15 @@
dir_texto = dir_hare_frente;
clearRoom();
- loadPic("ciego1.alg");
+ loadPic("blind1.alg");
decompressPic(dir_dibujo1, HALF_PAL);
- loadPic("ciego2.alg");
+ loadPic("blind2.alg");
decompressPic(dir_dibujo3, 1);
- loadPic("ciego3.alg");
+ loadPic("blind3.alg");
decompressPic(dir_hare_dch, 1);
- loadPic("ciego4.alg");
+ loadPic("blind4.alg");
decompressPic(dir_hare_fondo, 1);
- loadPic("ciego5.alg");
+ loadPic("blind5.alg");
decompressPic(dir_hare_frente, 1);
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -3280,7 +3280,7 @@
if (flags[4] == 1)
talk_hacker(_textd[_lang][66], "d66.als");
pause(6);
- talk_ciego(_textd[_lang][78], "d78.als", _textd1[_lang][78 - TEXTD_START]);
+ talk_blind(_textd[_lang][78], "d78.als", _textd1[_lang][78 - TEXTD_START]);
pause(4);
talk_hacker(_textd[_lang][67], "d67.als");
@@ -3319,15 +3319,15 @@
pause(8);
clearRoom();
- loadPic("ciego1.alg");
+ loadPic("blind1.alg");
decompressPic(dir_dibujo1, HALF_PAL);
- loadPic("ciego2.alg");
+ loadPic("blind2.alg");
decompressPic(dir_dibujo3, 1);
- loadPic("ciego3.alg");
+ loadPic("blind3.alg");
decompressPic(dir_hare_dch, 1);
- loadPic("ciego4.alg");
+ loadPic("blind4.alg");
decompressPic(dir_hare_fondo, 1);
- loadPic("ciego5.alg");
+ loadPic("blind5.alg");
decompressPic(dir_hare_frente, 1);
if (_lang == kSpanish)
@@ -3338,12 +3338,12 @@
pause(10);
- talk_ciego(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
+ talk_blind(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
pause(5);
talk_hacker(_textd[_lang][57], "d57.als");
pause(6);
_system->delayMillis(1000);
- talk_ciego(_textd[_lang][77], "d77.als", _textd1[_lang][77 - TEXTD_START]);
+ talk_blind(_textd[_lang][77], "d77.als", _textd1[_lang][77 - TEXTD_START]);
talk_hacker(_textd[_lang][65], "d65.als");
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -3396,9 +3396,9 @@
flags[18] = 1;
flags[20] = 1;
- talk_igor_sentado(_texti[_lang][13], "I13.als");
- talk_igor_sentado(_texti[_lang][14], "I14.als");
- talk_igor_sentado(_texti[_lang][15], "I15.als");
+ talk_igor_seated(_texti[_lang][13], "I13.als");
+ talk_igor_seated(_texti[_lang][14], "I14.als");
+ talk_igor_seated(_texti[_lang][15], "I15.als");
flags[21] = 1;
} else {
talk(_text[_lang][356], "356.als");
@@ -3421,10 +3421,10 @@
talk(_text[_lang][276], "276.als");
pause(14);
- talk_igor_sentado(_texti[_lang][6], "I6.als");
+ talk_igor_seated(_texti[_lang][6], "I6.als");
}
- conversa("op_6.cal");
+ converse("op_6.cal");
flags[20] = 0;
flags[18] = 0;
}
@@ -3457,8 +3457,8 @@
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
hare_se_ve = 1;
- FundeAlNegro(0);
- sal_de_la_habitacion(0);
+ fadeToBlack(0);
+ exitRoom(0);
}
void DrasculaEngine::animation_6_4() {
@@ -3476,7 +3476,7 @@
update_26_pre();
x_igor = 104;
y_igor = 71;
- pon_igor();
+ placeIgor();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
pause(40);
talk_igor_frente(_texti[_lang][26], "I26.als");
@@ -3515,7 +3515,7 @@
void DrasculaEngine::animation_9_4() {
anima("st.bin", 14);
- FundeAlNegro(1);
+ fadeToBlack(1);
}
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-29 22:07:25 UTC (rev 32371)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-29 22:34:03 UTC (rev 32372)
@@ -162,34 +162,34 @@
VGA = (byte *)malloc(320 * 200);
memset(VGA, 0, 64000);
- lleva_objeto = 0;
- menu_bar = 0; menu_scr = 0; hay_nombre = 0;
+ takeObject = 0;
+ menuBar = 0; menuScreen = 0; hasName = 0;
frame_y = 0;
hare_x = -1; hare_se_mueve = 0; sentido_hare = 3; num_frame = 0; hare_se_ve = 1;
- comprueba_flags = 1;
+ checkFlags = 1;
rompo = 0; rompo2 = 0;
- anda_a_objeto = 0;
- step_x = PASO_HARE_X; step_y = PASO_HARE_Y;
- alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; alto_pies = PIES_HARE;
+ walkToObject = 0;
+ stepX = PASO_HARE_X; stepY = PASO_HARE_Y;
+ alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; feetHeight = PIES_HARE;
alto_talk = ALTO_TALK_HARE; ancho_talk = ANCHO_TALK_HARE;
- hay_answer = 0;
- conta_ciego_vez = 0;
- cambio_de_color = 0;
+ hasAnswer = 0;
+ conta_blind_vez = 0;
+ changeColor = 0;
rompo_y_salgo = 0;
vb_x = 120; sentido_vb = 1; vb_se_mueve = 0; frame_vb = 1;
frame_piano = 0;
- frame_borracho = 0;
+ frame_drunk = 0;
frame_velas = 0;
cont_sv = 0;
term_int = 0;
- corta_musica = 0;
+ musicStopped = 0;
hay_seleccion = 0;
Leng = 0;
UsingMem = 0;
- GlobalSpeed = 0;
- frame_ciego = 0;
- frame_ronquido = 0;
- frame_murcielago = 0;
+ globalSpeed = 0;
+ frame_blind = 0;
+ frame_snore = 0;
+ frame_bat = 0;
c_mirar = 0;
c_poder = 0;
ald = NULL;
@@ -252,7 +252,7 @@
frame_pen = 0;
flag_tv = 0;
- dir_pendulo = dir_dibujo3;
+ dir_pendulum = dir_dibujo3;
loadPic("96.alg");
decompressPic(dir_hare_frente, COMPLETE_PAL);
@@ -336,8 +336,8 @@
if (!file.isOpen())
error("missing game data %s %c", NamePcc, 7);
- Buffer_pcx = (byte *)malloc(65000);
- auxPun = Buffer_pcx;
+ pcxBuffer = (byte *)malloc(65000);
+ auxPun = pcxBuffer;
file.seek(128);
while (!fExit) {
ch = file.readByte();
@@ -359,8 +359,8 @@
}
void DrasculaEngine::decompressPic(byte *dir_escritura, int plt) {
- memcpy(dir_escritura, Buffer_pcx, 64000);
- free(Buffer_pcx);
+ memcpy(dir_escritura, pcxBuffer, 64000);
+ free(pcxBuffer);
setRGB((byte *)cPal, plt);
}
@@ -541,9 +541,9 @@
loadPic("2aux62.alg");
decompressPic(dir_dibujo2, 1);
sentido_hare = 1;
- obj_saliendo = 104;
+ objExit = 104;
if (hay_que_load != 0) {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
} else {
@@ -553,80 +553,80 @@
lleva_al_hare(65, 145);
}
} else if (num_ejec == 2) {
- suma_objeto(28);
+ addObject(28);
sentido_hare = 3;
- obj_saliendo = 162;
+ objExit = 162;
if (hay_que_load == 0)
carga_escoba("14.ald");
else {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
}
} else if (num_ejec == 3) {
- suma_objeto(28);
- suma_objeto(11);
- suma_objeto(14);
- suma_objeto(22);
- suma_objeto(9);
- suma_objeto(20);
- suma_objeto(19);
+ addObject(28);
+ addObject(11);
+ addObject(14);
+ addObject(22);
+ addObject(9);
+ addObject(20);
+ addObject(19);
flags[1] = 1;
sentido_hare = 1;
- obj_saliendo = 99;
+ objExit = 99;
if (hay_que_load == 0)
carga_escoba("20.ald");
else {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
}
} else if (num_ejec == 4) {
- suma_objeto(28);
- suma_objeto(9);
- suma_objeto(20);
- suma_objeto(22);
- obj_saliendo = 100;
+ addObject(28);
+ addObject(9);
+ addObject(20);
+ addObject(22);
+ objExit = 100;
if (hay_que_load == 0) {
carga_escoba("21.ald");
sentido_hare = 0;
hare_x = 235;
hare_y = 164;
} else {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
}
} else if (num_ejec == 5) {
- suma_objeto(28);
- suma_objeto(7);
- suma_objeto(9);
- suma_objeto(11);
- suma_objeto(13);
- suma_objeto(14);
- suma_objeto(15);
- suma_objeto(17);
- suma_objeto(20);
+ addObject(28);
+ addObject(7);
+ addObject(9);
+ addObject(11);
+ addObject(13);
+ addObject(14);
+ addObject(15);
+ addObject(17);
+ addObject(20);
sentido_hare = 1;
- obj_saliendo = 100;
+ objExit = 100;
if (hay_que_load == 0) {
carga_escoba("45.ald");
} else {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
}
} else if (num_ejec == 6) {
- suma_objeto(28);
- suma_objeto(9);
+ addObject(28);
+ addObject(9);
sentido_hare = 1;
- obj_saliendo = 104;
+ objExit = 104;
if (hay_que_load == 0) {
carga_escoba("58.ald");
animation_1_6();
} else {
- if (!para_cargar(nom_partida)) {
+ if (!para_cargar(saveName)) {
return true;
}
loadPic("auxdr.alg");
@@ -636,12 +636,12 @@
bucles:
if (hare_se_mueve == 0) {
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
}
- if (hare_se_mueve == 0 && anda_a_objeto == 1) {
+ if (hare_se_mueve == 0 && walkToObject == 1) {
sentido_hare = sentido_final;
- anda_a_objeto = 0;
+ walkToObject = 0;
}
if (num_ejec == 2) {
@@ -653,7 +653,7 @@
lleva_al_hare(190, 130);
}
- mueve_cursor();
+ moveCursor();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
if (num_ejec == 2) {
@@ -666,23 +666,23 @@
updateEvents();
- if (menu_scr == 0 && lleva_objeto == 1)
- comprueba_objetos();
+ if (menuScreen == 0 && takeObject == 1)
+ checkObjects();
- if (button_dch == 1 && menu_scr == 1) {
+ if (button_dch == 1 && menuScreen == 1) {
delay(100);
if (num_ejec == 2)
- loadPic(fondo_y_menu);
+ loadPic(menuBackground);
else
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
setPalette((byte *)&gamePalette);
- menu_scr = 0;
+ menuScreen = 0;
updateEvents();
if (num_ejec != 3)
cont_sv = 0;
}
- if (button_dch == 1 && menu_scr == 0) {
+ if (button_dch == 1 && menuScreen == 0) {
delay(100);
hare_se_mueve = 0;
if (sentido_hare == 2)
@@ -696,58 +696,58 @@
else
loadPic("icons.alg");
decompressPic(dir_hare_fondo, 1);
- menu_scr = 1;
+ menuScreen = 1;
updateEvents();
withoutVerb();
if (num_ejec != 3)
cont_sv = 0;
}
- if (button_izq == 1 && menu_bar == 1) {
+ if (button_izq == 1 && menuBar == 1) {
delay(100);
elige_en_barra();
if (num_ejec != 3)
cont_sv = 0;
- } else if (button_izq == 1 && lleva_objeto == 0) {
+ } else if (button_izq == 1 && takeObject == 0) {
delay(100);
if (comprueba1())
return true;
if (num_ejec != 3)
cont_sv = 0;
- } else if (button_izq == 1 && lleva_objeto == 1) {
+ } else if (button_izq == 1 && takeObject == 1) {
if (comprueba2())
return true;
if (num_ejec != 3)
cont_sv = 0;
}
- if (mouseY < 24 && menu_scr == 0)
- menu_bar = 1;
+ if (mouseY < 24 && menuScreen == 0)
+ menuBar = 1;
else
- menu_bar = 0;
+ menuBar = 0;
- Common::KeyCode key = getscan();
- if (key == Common::KEYCODE_F1 && menu_scr == 0) {
- elige_verbo(1);
+ Common::KeyCode key = getScan();
+ if (key == Common::KEYCODE_F1 && menuScreen == 0) {
+ selectVerb(1);
if (num_ejec != 3)
cont_sv = 0;
- } else if (key == Common::KEYCODE_F2 && menu_scr == 0) {
- elige_verbo(2);
+ } else if (key == Common::KEYCODE_F2 && menuScreen == 0) {
+ selectVerb(2);
if (num_ejec != 3)
cont_sv = 0;
- } else if (key == Common::KEYCODE_F3 && menu_scr == 0) {
- elige_verbo(3);
+ } else if (key == Common::KEYCODE_F3 && menuScreen == 0) {
+ selectVerb(3);
if (num_ejec != 3)
cont_sv = 0;
- } else if (key == Common::KEYCODE_F4 && menu_scr == 0) {
- elige_verbo(4);
+ } else if (key == Common::KEYCODE_F4 && menuScreen == 0) {
+ selectVerb(4);
cont_sv = 0;
- } else if (key == Common::KEYCODE_F5 && menu_scr == 0) {
- elige_verbo(5);
+ } else if (key == Common::KEYCODE_F5 && menuScreen == 0) {
+ selectVerb(5);
if (num_ejec != 3)
cont_sv = 0;
- } else if (key == Common::KEYCODE_F6 && menu_scr == 0) {
- elige_verbo(6);
+ } else if (key == Common::KEYCODE_F6 && menuScreen == 0) {
+ selectVerb(6);
if (num_ejec != 3)
cont_sv = 0;
} else if (key == Common::KEYCODE_F9) {
@@ -786,7 +786,7 @@
loadPic("alcbar.alg");
decompressPic(dir_dibujo1, 255);
} else if (cont_sv == 1500) {
- salva_pantallas();
+ screenSaver();
if (num_ejec != 3)
cont_sv = 0;
} else {
@@ -808,7 +808,7 @@
decompressPic(dir_hare_fondo, 1);
chooseObject(objeto);
if (num_ejec == 2)
- loadPic(fondo_y_menu);
+ loadPic(menuBackground);
else
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
@@ -816,18 +816,18 @@
void DrasculaEngine::chooseObject(int objeto) {
if (num_ejec == 5) {
- if (lleva_objeto == 1 && menu_scr == 0 && pickedObject != 16)
- suma_objeto(pickedObject);
+ if (takeObject == 1 && menuScreen == 0 && pickedObject != 16)
+ addObject(pickedObject);
} else {
- if (lleva_objeto == 1 && menu_scr == 0)
- suma_objeto(pickedObject);
+ if (takeObject == 1 && menuScreen == 0)
+ addObject(pickedObject);
}
copyBackground(x1d_menu[objeto], y1d_menu[objeto], 0, 0, OBJWIDTH,OBJHEIGHT, dir_hare_fondo, dir_dibujo3);
- lleva_objeto = 1;
+ takeObject = 1;
pickedObject = objeto;
}
-int DrasculaEngine::resta_objeto(int osj) {
+int DrasculaEngine::removeObject(int osj) {
int result = 1;
for (int h = 1; h < 43; h++) {
@@ -843,27 +843,27 @@
void DrasculaEngine::withoutVerb() {
int c = 171;
- if (menu_scr == 1)
+ if (menuScreen == 1)
c = 0;
if (num_ejec == 5) {
- if (lleva_objeto == 1 && pickedObject != 16)
- suma_objeto(pickedObject);
+ if (takeObject == 1 && pickedObject != 16)
+ addObject(pickedObject);
} else {
- if (lleva_objeto == 1)
- suma_objeto(pickedObject);
+ if (takeObject == 1)
+ addObject(pickedObject);
}
copyBackground(0, c, 0, 0, OBJWIDTH,OBJHEIGHT, dir_hare_fondo, dir_dibujo3);
- lleva_objeto = 0;
- hay_nombre = 0;
+ takeObject = 0;
+ hasName = 0;
}
-bool DrasculaEngine::para_cargar(char nom_game[]) {
+bool DrasculaEngine::para_cargar(char gameName[]) {
previousMusic = roomMusic;
- menu_scr = 0;
+ menuScreen = 0;
if (num_ejec != 1)
clearRoom();
- if (!carga_partida(nom_game))
+ if (!loadGame(gameName))
return false;
if (num_ejec == 2 || num_ejec == 3 || num_ejec == 5) {
delete ald;
@@ -905,7 +905,7 @@
char para_codificar[20];
char buffer[256];
- hay_nombre = 0;
+ hasName = 0;
strcpy(para_codificar, nom_fich);
strcpy(currentData, nom_fich);
@@ -935,11 +935,11 @@
getLine(ald, buffer, size);
sscanf(buffer, "%d",&alto_hare);
getLine(ald, buffer, size);
- sscanf(buffer, "%d",&alto_pies);
+ sscanf(buffer, "%d",&feetHeight);
getLine(ald, buffer, size);
- sscanf(buffer, "%d",&step_x);
+ sscanf(buffer, "%d",&stepX);
getLine(ald, buffer, size);
- sscanf(buffer, "%d",&step_y);
+ sscanf(buffer, "%d",&stepY);
getLine(ald, buffer, size);
sscanf(buffer, "%s",pant1);
@@ -957,7 +957,7 @@
loadPic(pant4);
decompressPic(dir_hare_fondo, 1);
- strcpy(fondo_y_menu, pant4);
+ strcpy(menuBackground, pant4);
}
martini:
@@ -967,7 +967,7 @@
for (l = 0; l < numRoomObjs; l++) {
getLine(ald, buffer, size);
- sscanf(buffer, "%d", &num_obj[l]);
+ sscanf(buffer, "%d", &objectNum[l]);
getLine(ald, buffer, size);
sscanf(buffer, "%s", objName[l]);
getLine(ald, buffer, size);
@@ -990,7 +990,7 @@
sscanf(buffer, "%d", &isDoor[l]);
if (isDoor[l] != 0) {
getLine(ald, buffer, size);
- sscanf(buffer, "%s", alapantallakeva[l]);
+ sscanf(buffer, "%s", targetScreen[l]);
getLine(ald, buffer, size);
sscanf(buffer, "%d", &x_alakeva[l]);
getLine(ald, buffer, size);
@@ -1023,11 +1023,11 @@
if (num_ejec == 2) {
if (martin == 0) {
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
alto_hare = CHARACTER_HEIGHT;
ancho_hare = CHARACTER_WIDTH;
- alto_pies = PIES_HARE;
+ feetHeight = PIES_HARE;
loadPic("97.alg");
decompressPic(dir_hare_dch, 1);
loadPic("96.alg");
@@ -1035,12 +1035,12 @@
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
- strcpy(fondo_y_menu, "99.alg");
+ strcpy(menuBackground, "99.alg");
}
}
for (l = 0; l < numRoomObjs; l++) {
- if (num_obj[l] == obj_saliendo)
+ if (objectNum[l] == objExit)
obj_salir = l;
}
@@ -1070,7 +1070,7 @@
paleta_hare_oscuro();
hare_claro();
- cambio_de_color = -1;
+ changeColor = -1;
if (num_ejec == 2)
color_abc(LIGHT_GREEN);
@@ -1153,11 +1153,11 @@
if (num_ejec == 2) {
if (roomNumber == 9 || roomNumber == 2 || roomNumber == 14 || roomNumber == 18)
- conta_ciego_vez = vez();
+ conta_blind_vez = vez();
}
if (num_ejec == 4) {
if (roomNumber == 26)
- conta_ciego_vez = vez();
+ conta_blind_vez = vez();
}
if (num_ejec == 4 && roomNumber == 24 && flags[29] == 1)
@@ -1179,7 +1179,7 @@
_system->updateScreen();
}
-void DrasculaEngine::lleva_al_hare(int punto_x, int punto_y) {
+void DrasculaEngine::lleva_al_hare(int pointX, int pointY) {
if (num_ejec == 5 || num_ejec == 6) {
if (hare_se_ve == 0) {
hare_x = sitio_x;
@@ -1187,9 +1187,9 @@
goto fin;
}
}
- sitio_x = punto_x;
- sitio_y = punto_y;
- empieza_andar();
+ sitio_x = pointX;
+ sitio_y = pointY;
+ startWalking();
for (;;) {
updateRoom();
@@ -1198,8 +1198,8 @@
break;
}
- if (anda_a_objeto == 1) {
- anda_a_objeto = 0;
+ if (walkToObject == 1) {
+ walkToObject = 0;
sentido_hare = sentido_final;
}
fin:
@@ -1207,8 +1207,8 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
}
-void DrasculaEngine::mueve_cursor() {
- int pos_cursor[8];
+void DrasculaEngine::moveCursor() {
+ int cursorPos[8];
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -1216,36 +1216,36 @@
pon_hare();
updateRefresh();
- if (!strcmp(texto_nombre, "hacker") && hay_nombre == 1) {
- if (_color != RED && menu_scr == 0)
+ if (!strcmp(textName, "hacker") && hasName == 1) {
+ if (_color != RED && menuScreen == 0)
color_abc(RED);
- } else if (menu_scr == 0 && _color != LIGHT_GREEN)
+ } else if (menuScreen == 0 && _color != LIGHT_GREEN)
color_abc(LIGHT_GREEN);
- if (hay_nombre == 1 && menu_scr == 0)
- centra_texto(texto_nombre, mouseX, mouseY);
- if (menu_scr == 1)
+ if (hasName == 1 && menuScreen == 0)
+ centerText(textName, mouseX, mouseY);
+ if (menuScreen == 1)
menu_sin_volcar();
- else if (menu_bar == 1)
- barra_menu();
+ else if (menuBar == 1)
+ clearMenu();
- pos_cursor[0] = 0;
- pos_cursor[1] = 0;
- pos_cursor[2] = mouseX - 20;
- pos_cursor[3] = mouseY - 17;
- pos_cursor[4] = OBJWIDTH;
- pos_cursor[5] = OBJHEIGHT;
- copyRectClip(pos_cursor, dir_dibujo3, dir_zona_pantalla);
+ cursorPos[0] = 0;
+ cursorPos[1] = 0;
+ cursorPos[2] = mouseX - 20;
+ cursorPos[3] = mouseY - 17;
+ cursorPos[4] = OBJWIDTH;
+ cursorPos[5] = OBJHEIGHT;
+ copyRectClip(cursorPos, dir_dibujo3, dir_zona_pantalla);
}
-void DrasculaEngine::comprueba_objetos() {
+void DrasculaEngine::checkObjects() {
int l, veo = 0;
for (l = 0; l < numRoomObjs; l++) {
if (mouseX > x1[l] && mouseY > y1[l]
&& mouseX < x2[l] && mouseY < y2[l]
&& visible[l] == 1 && isDoor[l] == 0) {
- strcpy(texto_nombre, objName[l]);
- hay_nombre = 1;
+ strcpy(textName, objName[l]);
+ hasName = 1;
veo = 1;
}
}
@@ -1253,21 +1253,21 @@
if (num_ejec == 2) {
if (mouseX > hare_x + 2 && mouseY > hare_y + 2
&& mouseX < hare_x + ancho_hare - 2 && mouseY < hare_y + alto_hare - 2) {
- strcpy(texto_nombre, "hacker");
- hay_nombre = 1;
+ strcpy(textName, "hacker");
+ hasName = 1;
veo = 1;
}
} else {
if (mouseX > hare_x + 2 && mouseY > hare_y + 2
&& mouseX < hare_x + ancho_hare - 2 && mouseY < hare_y + alto_hare - 2 && veo == 0) {
- strcpy(texto_nombre, "hacker");
- hay_nombre = 1;
+ strcpy(textName, "hacker");
+ hasName = 1;
veo = 1;
}
}
if (veo == 0)
- hay_nombre = 0;
+ hasName = 0;
}
void DrasculaEngine::elige_en_barra() {
@@ -1280,19 +1280,19 @@
if (num_verbo < 1)
withoutVerb();
else
- elige_verbo(num_verbo);
+ selectVerb(num_verbo);
}
bool DrasculaEngine::comprueba1() {
int l;
- if (menu_scr == 1)
+ if (menuScreen == 1)
removeObject();
else {
for (l = 0; l < numRoomObjs; l++) {
if (mouseX >= x1[l] && mouseY >= y1[l]
&& mouseX <= x2[l] && mouseY <= y2[l] && rompo == 0) {
- if (sal_de_la_habitacion(l))
+ if (exitRoom(l))
return true;
if (rompo == 1)
break;
@@ -1310,8 +1310,8 @@
sitio_y = sitiobj_y[l];
sentido_final = sentidobj[l];
rompo = 1;
- anda_a_objeto = 1;
- empieza_andar();
+ walkToObject = 1;
+ startWalking();
}
}
@@ -1323,12 +1323,12 @@
sitio_x = suelo_x1;
if (sitio_x > suelo_x2)
sitio_x = suelo_x2;
- if (sitio_y < suelo_y1 + alto_pies)
- sitio_y = suelo_y1 + alto_pies;
+ if (sitio_y < suelo_y1 + feetHeight)
+ sitio_y = suelo_y1 + feetHeight;
if (sitio_y > suelo_y2)
sitio_y = suelo_y2;
- empieza_andar();
+ startWalking();
}
rompo = 0;
}
@@ -1339,21 +1339,21 @@
bool DrasculaEngine::comprueba2() {
int l;
- if (menu_scr == 1) {
- if (coge_objeto())
+ if (menuScreen == 1) {
+ if (pickupObject())
return true;
} else {
- if (!strcmp(texto_nombre, "hacker") && hay_nombre == 1) {
- if (banderas(50))
+ if (!strcmp(textName, "hacker") && hasName == 1) {
+ if (checkFlag(50))
return true;
} else {
for (l = 0; l < numRoomObjs; l++) {
if (mouseX > x1[l] && mouseY > y1[l]
&& mouseX < x2[l] && mouseY < y2[l] && visible[l] == 1) {
sentido_final = sentidobj[l];
- anda_a_objeto = 1;
+ walkToObject = 1;
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
- if (banderas(num_obj[l]))
+ if (checkFlag(objectNum[l]))
return true;
if (num_ejec == 4)
break;
@@ -1365,7 +1365,7 @@
return false;
}
-Common::KeyCode DrasculaEngine::getscan() {
+Common::KeyCode DrasculaEngine::getScan() {
updateEvents();
return _keyPressed.keycode;
@@ -1412,22 +1412,22 @@
}
}
-void DrasculaEngine::elige_verbo(int verbo) {
+void DrasculaEngine::selectVerb(int verbo) {
int c = 171;
- if (menu_scr == 1)
+ if (menuScreen == 1)
c = 0;
if (num_ejec == 5) {
- if (lleva_objeto == 1 && pickedObject != 16)
- suma_objeto(pickedObject);
+ if (takeObject == 1 && pickedObject != 16)
+ addObject(pickedObject);
} else {
- if (lleva_objeto == 1)
- suma_objeto(pickedObject);
+ if (takeObject == 1)
+ addObject(pickedObject);
}
copyBackground(OBJWIDTH * verbo, c, 0, 0, OBJWIDTH, OBJHEIGHT, dir_hare_fondo, dir_dibujo3);
- lleva_objeto = 1;
+ takeObject = 1;
pickedObject = verbo;
}
@@ -1450,7 +1450,7 @@
copyBackground(183, 56, 138, nivel_voc, 39, 2 + ((_mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType) / 16) * 4), dir_mesa, dir_zona_pantalla);
copyBackground(183, 56, 194, nivel_cd, 39, 2 + ((_mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / 16) * 4), dir_mesa, dir_zona_pantalla);
- cursor_mesa();
+ setCursorTable();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
@@ -1496,8 +1496,8 @@
}
bool DrasculaEngine::saves() {
- char nombres[10][23];
- char fichero[50];
+ char names[10][23];
+ char file[50];
char fileEpa[50];
int n, n2, num_sav = 0, y = 27;
Common::InSaveFile *sav;
@@ -1518,7 +1518,7 @@
}
}
for (n = 0; n < NUM_SAVES; n++)
- sav->readLine(nombres[n], 23);
+ sav->readLine(names[n], 23);
delete sav;
loadPic("savescr.alg");
@@ -1530,11 +1530,11 @@
y = 27;
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
for (n = 0; n < NUM_SAVES; n++) {
- print_abc(nombres[n], 116, y);
+ print_abc(names[n], 116, y);
y = y + 9;
}
print_abc(select, 117, 15);
- cursor_mesa();
+ setCursorTable();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
y = 27;
@@ -1544,22 +1544,22 @@
delay(100);
for (n = 0; n < NUM_SAVES; n++) {
if (mouseX > 115 && mouseY > y + (9 * n) && mouseX < 115 + 175 && mouseY < y + 10 + (9 * n)) {
- strcpy(select, nombres[n]);
+ strcpy(select, names[n]);
if (strcmp(select, "*"))
hay_seleccion = 1;
else {
- introduce_nombre();
- strcpy(nombres[n], select);
+ enterName();
+ strcpy(names[n], select);
if (hay_seleccion == 1) {
- snprintf(fichero, 50, "%s%02d", _targetName.c_str(), n + 1);
- para_grabar(fichero);
+ snprintf(file, 50, "%s%02d", _targetName.c_str(), n + 1);
+ para_grabar(file);
Common::OutSaveFile *tsav;
if (!(tsav = _saveFileMan->openForSaving(fileEpa))) {
error("Can't open %s file", fileEpa);
}
for (n = 0; n < NUM_SAVES; n++) {
- tsav->writeString(nombres[n]);
+ tsav->writeString(names[n]);
tsav->writeString("\n");
}
tsav->finalize();
@@ -1570,39 +1570,39 @@
print_abc(select, 117, 15);
y = 27;
for (n2 = 0; n2 < NUM_SAVES; n2++) {
- print_abc(nombres[n2], 116, y);
+ print_abc(names[n2], 116, y);
y = y + 9;
}
if (hay_seleccion == 1) {
- snprintf(fichero, 50, "%s%02d", _targetName.c_str(), n + 1);
+ snprintf(file, 50, "%s%02d", _targetName.c_str(), n + 1);
}
num_sav = n;
}
}
if (mouseX > 117 && mouseY > 15 && mouseX < 295 && mouseY < 24 && hay_seleccion == 1) {
- introduce_nombre();
- strcpy(nombres[num_sav], select);
+ enterName();
+ strcpy(names[num_sav], select);
print_abc(select, 117, 15);
y = 27;
for (n2 = 0; n2 < NUM_SAVES; n2++) {
- print_abc(nombres[n2], 116, y);
+ print_abc(names[n2], 116, y);
y = y + 9;
}
}
if (mouseX > 125 && mouseY > 123 && mouseX < 199 && mouseY < 149 && hay_seleccion == 1) {
- if (!para_cargar(fichero))
+ if (!para_cargar(file))
return false;
break;
} else if (mouseX > 208 && mouseY > 123 && mouseX < 282 && mouseY < 149 && hay_seleccion == 1) {
- para_grabar(fichero);
+ para_grabar(file);
Common::OutSaveFile *tsav;
if (!(tsav = _saveFileMan->openForSaving(fileEpa))) {
error("Can't open %s file", fileEpa);
}
for (n = 0; n < NUM_SAVES; n++) {
- tsav->writeString(nombres[n]);
+ tsav->writeString(names[n]);
tsav->writeString("\n");
}
tsav->finalize();
@@ -1674,7 +1674,7 @@
else if (c == '\255')
x_de_letra = X_ABRE_EXCLAMACION;
else if (c == ';')
- x_de_letra = X_PUNTO_Y_COMA;
+ x_de_letra = X_pointY_COMA;
else if (c == '>')
x_de_letra = X_GREATER_THAN;
else if (c == '<')
@@ -1766,12 +1766,12 @@
color_abc(RED);
updateRoom();
- centra_texto(_textsys[_lang][1], 160, 87);
+ centerText(_textsys[_lang][1], 160, 87);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
delay(100);
for (;;) {
- key = getscan();
+ key = getScan();
if (key != 0)
break;
}
@@ -1784,7 +1784,7 @@
return true;
}
-void DrasculaEngine::salva_pantallas() {
+void DrasculaEngine::screenSaver() {
int xr, yr;
byte *copia, *ghost;
Common::File file;
@@ -1912,13 +1912,13 @@
void DrasculaEngine::fliplay(const char *filefli, int vel) {
OpenSSN(filefli, vel);
while (PlayFrameSSN() && (!term_int)) {
- if (getscan() == Common::KEYCODE_ESCAPE)
+ if (getScan() == Common::KEYCODE_ESCAPE)
term_int = 1;
}
EndSSN();
}
-void DrasculaEngine::FundeDelNegro(int VelocidadDeFundido) {
+void DrasculaEngine::fadeFromBlack(int VelocidadDeFundido) {
char fundido;
unsigned int color, componente;
@@ -1956,14 +1956,14 @@
setPalette((byte *)&gamePalette);
}
-char DrasculaEngine::LimitaVGA(char valor) {
- return (valor & 0x3F) * (valor > 0);
+char DrasculaEngine::LimitaVGA(char value) {
+ return (value & 0x3F) * (value > 0);
}
-void DrasculaEngine::centra_texto(const char *mensaje, int x_texto, int y_texto) {
+void DrasculaEngine::centerText(const char *message, int textX, int textY) {
char bb[200], m2[200], m1[200], mb[10][50];
char m3[200];
- int h, fil, x_texto3, x_texto2, x_texto1, conta_f = 0, ya = 0;
+ int h, fil, textX3, textX2, textX1, conta_f = 0, ya = 0;
strcpy(m1, " ");
strcpy(m2, " ");
@@ -1973,24 +1973,24 @@
for (h = 0; h < 10; h++)
strcpy(mb[h], " ");
- if (x_texto > 160)
+ if (textX > 160)
ya = 1;
- strcpy(m1, mensaje);
- x_texto = CLIP<int>(x_texto, 60, 255);
+ strcpy(m1, message);
+ textX = CLIP<int>(textX, 60, 255);
- x_texto1 = x_texto;
+ textX1 = textX;
if (ya == 1)
- x_texto1 = 315 - x_texto;
+ textX1 = 315 - textX;
- x_texto2 = (strlen(m1) / 2) * CHAR_WIDTH;
+ textX2 = (strlen(m1) / 2) * CHAR_WIDTH;
tut:
strcpy(bb, m1);
scumm_strrev(bb);
- if (x_texto1 < x_texto2) {
+ if (textX1 < textX2) {
strcpy(m3, strrchr(m1, ' '));
strcpy(m1, strstr(bb, " "));
scumm_strrev(m1);
@@ -1999,8 +1999,8 @@
strcpy(m2, m3);
};
- x_texto2 = (strlen(m1) / 2) * CHAR_WIDTH;
- if (x_texto1 < x_texto2)
+ textX2 = (strlen(m1) / 2) * CHAR_WIDTH;
+ if (textX1 < textX2)
goto tut;
strcpy(mb[conta_f], m1);
@@ -2017,19 +2017,19 @@
imprimir:
- fil = y_texto - (((conta_f + 3) * CHAR_HEIGHT));
+ fil = textY - (((conta_f + 3) * CHAR_HEIGHT));
for (h = 0; h < conta_f + 1; h++) {
- x_texto3 = strlen(mb[h]) / 2;
- print_abc(mb[h], ((x_texto) - x_texto3 * CHAR_WIDTH) - 1, fil);
+ textX3 = strlen(mb[h]) / 2;
+ print_abc(mb[h], ((textX) - textX3 * CHAR_WIDTH) - 1, fil);
fil = fil + CHAR_HEIGHT + 2;
}
}
-void DrasculaEngine::playSound(const char *fichero) {
+void DrasculaEngine::playSound(const char *file) {
if (hay_sb == 1) {
sku = new Common::File;
- sku->open(fichero);
+ sku->open(file);
if (!sku->isOpen()) {
error("no puedo abrir archivo de voz");
}
@@ -2051,7 +2051,7 @@
FileIn.open(animation);
if (!FileIn.isOpen()) {
- error("No encuentro un fichero de animation.");
+ error("No encuentro un file de animation.");
}
FileIn.read(&NFrames, sizeof(NFrames));
@@ -2081,7 +2081,7 @@
_system->updateScreen();
WaitForNext(FPS);
cnt++;
- byte key = getscan();
+ byte key = getScan();
if (key == Common::KEYCODE_ESCAPE)
term_int = 1;
if (key != 0)
@@ -2091,7 +2091,7 @@
free(AuxBuffDes);
FileIn.close();
- return ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE));
+ return ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE));
}
void DrasculaEngine::animastopSound_corte() {
@@ -2103,7 +2103,7 @@
}
}
-void DrasculaEngine::FundeAlNegro(int VelocidadDeFundido) {
+void DrasculaEngine::fadeToBlack(int VelocidadDeFundido) {
char fundido;
unsigned int color, componente;
@@ -2125,7 +2125,7 @@
_system->delayMillis(cuanto * 30); // was originaly 2
}
-void DrasculaEngine::pon_igor() {
+void DrasculaEngine::placeIgor() {
int pos_igor[6];
pos_igor[0] = 1;
@@ -2145,7 +2145,7 @@
copyRectClip(pos_igor, dir_hare_frente, dir_zona_pantalla);
}
-void DrasculaEngine::pon_dr() {
+void DrasculaEngine::placeDrascula() {
int pos_dr[6];
if (sentido_dr == 1)
@@ -2166,7 +2166,7 @@
copyRectClip(pos_dr, dir_hare_fondo, dir_zona_pantalla);
}
-void DrasculaEngine::pon_bj() {
+void DrasculaEngine::placeBJ() {
int pos_bj[6];
if (sentido_bj == 3)
@@ -2182,7 +2182,7 @@
copyRectClip(pos_bj, dir_dibujo3, dir_zona_pantalla);
}
-void DrasculaEngine::hipo(int counter) {
+void DrasculaEngine::hiccup(int counter) {
int y = 0, sentido = 0;
if (num_ejec == 3)
y = -1;
@@ -2256,17 +2256,17 @@
updateRefresh();
}
-bool DrasculaEngine::carga_partida(const char *nom_game) {
+bool DrasculaEngine::loadGame(const char *gameName) {
int l, n_ejec2;
Common::InSaveFile *sav;
- if (!(sav = _saveFileMan->openForLoading(nom_game))) {
+ if (!(sav = _saveFileMan->openForLoading(gameName))) {
error("missing savegame file");
}
n_ejec2 = sav->readSint32LE();
if (n_ejec2 != num_ejec) {
- strcpy(nom_partida, nom_game);
+ strcpy(saveName, gameName);
num_ejec = n_ejec2 - 1;
hay_que_load = 1;
return false;
@@ -2284,7 +2284,7 @@
flags[l] = sav->readSint32LE();
}
- lleva_objeto = sav->readSint32LE();
+ takeObject = sav->readSint32LE();
pickedObject = sav->readSint32LE();
hay_que_load = 0;
@@ -2295,50 +2295,50 @@
if (num_ejec == 1 || num_ejec == 3 || num_ejec == 5 || num_ejec == 6)
return;
else if (num_ejec == 2) {
- if (num_obj[doorNum] == 138)
+ if (objectNum[doorNum] == 138)
isDoor[doorNum] = flags[0];
- else if (num_obj[doorNum] == 136)
+ else if (objectNum[doorNum] == 136)
isDoor[doorNum] = flags[8];
- else if (num_obj[doorNum] == 156)
+ else if (objectNum[doorNum] == 156)
isDoor[doorNum] = flags[16];
- else if (num_obj[doorNum] == 163)
+ else if (objectNum[doorNum] == 163)
isDoor[doorNum] = flags[17];
- else if (num_obj[doorNum] == 177)
+ else if (objectNum[doorNum] == 177)
isDoor[doorNum] = flags[15];
- else if (num_obj[doorNum] == 175)
+ else if (objectNum[doorNum] == 175)
isDoor[doorNum] = flags[40];
- else if (num_obj[doorNum] == 173)
+ else if (objectNum[doorNum] == 173)
isDoor[doorNum] = flags[36];
} else if (num_ejec == 4) {
- if (num_obj[doorNum] == 101 && flags[0] == 0)
+ if (objectNum[doorNum] == 101 && flags[0] == 0)
isDoor[doorNum] = 0;
- else if (num_obj[doorNum] == 101 && flags[0] == 1 && flags[28] == 1)
+ else if (objectNum[doorNum] == 101 && flags[0] == 1 && flags[28] == 1)
isDoor[doorNum] = 1;
- else if (num_obj[doorNum] == 103)
+ else if (objectNum[doorNum] == 103)
isDoor[doorNum] = flags[0];
- else if (num_obj[doorNum] == 104)
+ else if (objectNum[doorNum] == 104)
isDoor[doorNum] = flags[1];
- else if (num_obj[doorNum] == 105)
+ else if (objectNum[doorNum] == 105)
isDoor[doorNum] = flags[1];
- else if (num_obj[doorNum] == 106)
+ else if (objectNum[doorNum] == 106)
isDoor[doorNum] = flags[2];
- else if (num_obj[doorNum] == 107)
+ else if (objectNum[doorNum] == 107)
isDoor[doorNum] = flags[2];
- else if (num_obj[doorNum] == 110)
+ else if (objectNum[doorNum] == 110)
isDoor[doorNum] = flags[6];
- else if (num_obj[doorNum] == 114)
+ else if (objectNum[doorNum] == 114)
isDoor[doorNum] = flags[4];
- else if (num_obj[doorNum] == 115)
+ else if (objectNum[doorNum] == 115)
isDoor[doorNum] = flags[4];
- else if (num_obj[doorNum] == 116 && flags[5] == 0)
+ else if (objectNum[doorNum] == 116 && flags[5] == 0)
isDoor[doorNum] = 0;
- else if (num_obj[doorNum] == 116 && flags[5] == 1 && flags[23] == 1)
+ else if (objectNum[doorNum] == 116 && flags[5] == 1 && flags[23] == 1)
isDoor[doorNum] = 1;
- else if (num_obj[doorNum] == 117)
+ else if (objectNum[doorNum] == 117)
isDoor[doorNum] = flags[5];
- else if (num_obj[doorNum] == 120)
+ else if (objectNum[doorNum] == 120)
isDoor[doorNum] = flags[8];
- else if (num_obj[doorNum] == 122)
+ else if (objectNum[doorNum] == 122)
isDoor[doorNum] = flags[7];
}
}
@@ -2397,11 +2397,11 @@
updatePalette();
}
-void DrasculaEngine::empieza_andar() {
+void DrasculaEngine::startWalking() {
hare_se_mueve = 1;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
if (num_ejec == 2) {
if ((sitio_x < hare_x) && (sitio_y <= (hare_y + alto_hare)))
@@ -2435,48 +2435,48 @@
int pos_hare[6];
int r;
- if (hare_se_mueve == 1 && step_x == PASO_HARE_X) {
- for (r = 0; r < step_x; r++) {
+ if (hare_se_mueve == 1 && stepX == PASO_HARE_X) {
+ for (r = 0; r < stepX; r++) {
if (num_ejec != 2) {
if (sentido_hare == 0 && sitio_x - r == hare_x + ancho_hare / 2) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
}
if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare / 2) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
hare_x = sitio_x - ancho_hare / 2;
hare_y = sitio_y - alto_hare;
}
} else if (num_ejec == 2) {
if (sentido_hare == 0 && sitio_x - r == hare_x) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
}
if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
hare_x = sitio_x - ancho_hare + 4;
hare_y = sitio_y - alto_hare;
}
}
}
}
- if (hare_se_mueve == 1 && step_y == PASO_HARE_Y) {
- for (r = 0; r < step_y; r++) {
+ if (hare_se_mueve == 1 && stepY == PASO_HARE_Y) {
+ for (r = 0; r < stepY; r++) {
if (sentido_hare == 2 && sitio_y - r == hare_y + alto_hare) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
}
if (sentido_hare == 3 && sitio_y + r == hare_y + alto_hare) {
hare_se_mueve = 0;
- step_x = PASO_HARE_X;
- step_y = PASO_HARE_Y;
+ stepX = PASO_HARE_X;
+ stepY = PASO_HARE_Y;
}
}
}
@@ -2565,7 +2565,7 @@
}
no_vuelco:
- aumenta_num_frame();
+ increaseFrameNum();
}
}
@@ -2573,7 +2573,7 @@
int h, n, x;
char texto_icono[13];
- x = sobre_que_objeto();
+ x = whichObject();
strcpy(texto_icono, iconName[x]);
for (n = 1; n < 43; n++) {
@@ -2595,7 +2595,7 @@
print_abc(texto_icono, itemLocations[x].x - 2, itemLocations[x].y - 7);
}
-void DrasculaEngine::barra_menu() {
+void DrasculaEngine::clearMenu() {
int n, sobre_verbo = 1;
for (n = 0; n < 7; n++) {
@@ -2613,25 +2613,25 @@
updateRoom();
for (n = 1; n < 43; n++){
- if (sobre_que_objeto() == n) {
+ if (whichObject() == n) {
h = inventoryObjects[n];
inventoryObjects[n] = 0;
if (h != 0)
- lleva_objeto = 1;
+ takeObject = 1;
}
}
updateEvents();
- if (lleva_objeto == 1)
+ if (takeObject == 1)
chooseObject(h);
}
-bool DrasculaEngine::sal_de_la_habitacion(int l) {
+bool DrasculaEngine::exitRoom(int l) {
char salgo[13];
if (num_ejec == 1) {
- if (num_obj[l] == 105 && flags[0] == 0)
+ if (objectNum[l] == 105 && flags[0] == 0)
talk(_text[_lang][442], "442.als");
else {
updateDoor(l);
@@ -2642,16 +2642,16 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
- if (num_obj[l] == 105) {
+ if (objectNum[l] == 105) {
animation_2_1();
return true;
}
clearRoom();
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x = -1;
carga_escoba(salgo);
@@ -2663,29 +2663,29 @@
lleva_al_hare(sitiobj_x[l], sitiobj_y[l]);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
- if (num_obj[l] == 136)
+ if (objectNum[l] == 136)
animation_2_2();
- if (num_obj[l] == 124)
+ if (objectNum[l] == 124)
animation_3_2();
- if (num_obj[l] == 173) {
+ if (objectNum[l] == 173) {
animation_35_2();
return true;
- } if (num_obj[l] == 146 && flags[39] == 1) {
+ } if (objectNum[l] == 146 && flags[39] == 1) {
flags[5] = 1;
flags[11] = 1;
}
- if (num_obj[l] == 176 && flags[29] == 1) {
+ if (objectNum[l] == 176 && flags[29] == 1) {
flags[29] = 0;
- resta_objeto(23);
- suma_objeto(11);
+ removeObject(23);
+ addObject(11);
}
clearRoom();
delete ald;
ald = NULL;
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x =- 1;
carga_escoba(salgo);
@@ -2699,11 +2699,11 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
clearRoom();
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x =- 1;
carga_escoba(salgo);
@@ -2717,14 +2717,14 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
- if (num_obj[l] == 108)
+ if (objectNum[l] == 108)
lleva_al_hare(171, 78);
clearRoom();
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x = -1;
carga_escoba(salgo);
@@ -2738,12 +2738,12 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
hare_se_ve = 1;
clearRoom();
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x = -1;
carga_escoba(salgo);
@@ -2757,16 +2757,16 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
- obj_saliendo = alapuertakeva[l];
+ objExit = alapuertakeva[l];
rompo = 1;
previousMusic = roomMusic;
clearRoom();
- strcpy(salgo, alapantallakeva[l]);
+ strcpy(salgo, targetScreen[l]);
strcat(salgo, ".ald");
hare_x = -1;
carga_escoba(salgo);
- if (obj_saliendo == 105)
+ if (objExit == 105)
animation_19_6();
}
}
@@ -2774,10 +2774,10 @@
return false;
}
-bool DrasculaEngine::coge_objeto() {
+bool DrasculaEngine::pickupObject() {
int h, n;
h = pickedObject;
- comprueba_flags = 1;
+ checkFlags = 1;
updateRoom();
menu_sin_volcar();
@@ -2787,34 +2787,34 @@
goto usando_verbos;
for (n = 1; n < 43; n++) {
- if (sobre_que_objeto() == n && inventoryObjects[n] == 0) {
+ if (whichObject() == n && inventoryObjects[n] == 0) {
inventoryObjects[n] = h;
- lleva_objeto = 0;
- comprueba_flags = 0;
+ takeObject = 0;
+ checkFlags = 0;
}
}
usando_verbos:
- if (comprueba_flags == 1) {
- if (comprueba_banderas_menu())
+ if (checkFlags == 1) {
+ if (checkMenuFlags())
return true;
}
updateEvents();
- if (lleva_objeto == 0)
+ if (takeObject == 0)
withoutVerb();
return false;
}
-bool DrasculaEngine::banderas(int fl) {
+bool DrasculaEngine::checkFlag(int fl) {
hare_se_mueve = 0;
updateRoom();
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- hay_answer = 1;
+ hasAnswer = 1;
- if (menu_scr == 1) {
+ if (menuScreen == 1) {
if (num_ejec == 1) {
if (pickedObject == kVerbLook && fl == 28)
talk(_text[_lang][328], "328.als");
@@ -2824,8 +2824,8 @@
talk(_text[_lang][164], "164.als");
flags[23] = 1;
withoutVerb();
- suma_objeto(7);
- suma_objeto(18);
+ addObject(7);
+ addObject(18);
} else if (pickedObject == kVerbLook && fl == 22 && flags[23] == 1)
talk(_text[_lang][307], "307.als");
else if (pickedObject == kVerbLook && fl == 28)
@@ -2869,7 +2869,7 @@
else if (pickedObject == kVerbLook && fl == 23)
talk(_text[_lang][152], "152.als");
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 3) {
if (pickedObject == kVerbLook && fl == 22)
talk(_text[_lang][307], "307.als");
@@ -2914,13 +2914,13 @@
else if (pickedObject == kVerbLook && fl == 23)
talk(_text[_lang][152], "152.als");
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 4) {
if ((pickedObject == 18 && fl == 19) || (pickedObject == 19 && fl == 18)) {
withoutVerb();
chooseObject(21);
- resta_objeto(18);
- resta_objeto(19);
+ removeObject(18);
+ removeObject(19);
} else if ((pickedObject == 14 && fl == 19) || (pickedObject == 19 && fl == 14))
talk(_text[_lang][484], "484.als");
else if (pickedObject == kVerbLook && fl == 28)
@@ -2964,7 +2964,7 @@
else if (pickedObject == kVerbLook && fl == 22)
talk(_text[_lang][161], "161.als");
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 5) {
if (pickedObject == kVerbLook && fl == 28)
talk(_text[_lang][328], "328.als");
@@ -2992,7 +2992,7 @@
else if (pickedObject == kVerbLook && fl == 20)
talk(_text[_lang][162], "162.als");
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook && fl == 28)
talk(_text[_lang][328], "328.als");
@@ -3004,7 +3004,7 @@
else if (pickedObject == kVerbLook && fl == 21)
talk(_text[_lang][441], "441.als");
else
- hay_answer = 0;
+ hasAnswer = 0;
}
} else {
if (num_ejec == 1) {
@@ -3025,7 +3025,7 @@
else if (roomNumber == 63)
room_63(fl);
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 2) {
if (pickedObject == kVerbLook && fl == 50)
talk(_text[_lang][308], "308.als");
@@ -3077,7 +3077,7 @@
else if (roomNumber == 19)
room_19(fl);
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 3) {
if (pickedObject == kVerbLook && fl == 50)
talk(_text[_lang][309], "309.als");
@@ -3095,7 +3095,7 @@
if (room_13(fl))
return true;
} else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 4) {
if (roomNumber == 28)
talk(_text[_lang][178], "178.als");
@@ -3145,7 +3145,7 @@
else if (roomNumber == 44)
room_44(fl);
else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 5) {
if (pickedObject == kVerbLook && fl == 50)
talk("Cuanto mas me miro, mas me gusto", "54.als");
@@ -3173,7 +3173,7 @@
if (room_56(fl))
return true;
} else
- hay_answer = 0;
+ hasAnswer = 0;
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook && fl == 50 && flags[0] == 1)
talk(_text[_lang][308], "308.als");
@@ -3190,7 +3190,7 @@
else if (pickedObject == kVerbTalk && fl == 50)
talk(_text[_lang][314], "314.als" );
else if (roomNumber == 102)
- room_pendulo(fl);
+ room_pendulum(fl);
else if (roomNumber == 58)
room_58(fl);
else if (roomNumber == 59)
@@ -3201,31 +3201,31 @@
} else if (roomNumber == 61)
room_61(fl);
else
- hay_answer = 0;
+ hasAnswer = 0;
}
}
- if (hay_answer == 0 && hay_nombre == 1)
+ if (hasAnswer == 0 && hasName == 1)
room_0();
- else if (hay_answer == 0 && menu_scr == 1)
+ else if (hasAnswer == 0 && menuScreen == 1)
room_0();
return false;
}
-void DrasculaEngine::cursor_mesa() {
- int pos_cursor[8];
+void DrasculaEngine::setCursorTable() {
+ int cursorPos[8];
- pos_cursor[0] = 225;
- pos_cursor[1] = 56;
- pos_cursor[2] = mouseX - 20;
- pos_cursor[3] = mouseY - 12;
- pos_cursor[4] = 40;
- pos_cursor[5] = 25;
+ cursorPos[0] = 225;
+ cursorPos[1] = 56;
+ cursorPos[2] = mouseX - 20;
+ cursorPos[3] = mouseY - 12;
+ cursorPos[4] = 40;
+ cursorPos[5] = 25;
- copyRectClip(pos_cursor, dir_mesa, dir_zona_pantalla);
+ copyRectClip(cursorPos, dir_mesa, dir_zona_pantalla);
}
-void DrasculaEngine::introduce_nombre() {
+void DrasculaEngine::enterName() {
Common::KeyCode key;
int v = 0, h = 0;
char select2[23];
@@ -3235,7 +3235,7 @@
copyBackground(115, 14, 115, 14, 176, 9, dir_dibujo1, dir_zona_pantalla);
print_abc(select2, 117, 15);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
- key = getscan();
+ key = getScan();
delay(70);
if (key != 0) {
if (key >= 0 && key <= 0xFF && isalpha(key))
@@ -3273,22 +3273,22 @@
}
}
-void DrasculaEngine::para_grabar(char nom_game[]) {
- saveGame(nom_game);
+void DrasculaEngine::para_grabar(char gameName[]) {
+ saveGame(gameName);
playSound("99.als");
stopSound();
}
void DrasculaEngine::OpenSSN(const char *Name, int Pause) {
MiVideoSSN = (byte *)malloc(64256);
- GlobalSpeed = 1000 / Pause;
+ globalSpeed = 1000 / Pause;
FrameSSN = 0;
UsingMem = 0;
if (MiVideoSSN == NULL)
return;
- _Sesion = new Common::File;
- _Sesion->open(Name);
- mSesion = TryInMem(_Sesion);
+ _Session = new Common::File;
+ _Session->open(Name);
+ mSession = TryInMem(_Session);
LastFrame = _system->getMillis();
}
@@ -3298,18 +3298,18 @@
byte *BufferSSN;
if (!UsingMem)
- _Sesion->read(&CHUNK, 1);
+ _Session->read(&CHUNK, 1);
else {
- memcpy(&CHUNK, mSesion, 1);
- mSesion += 1;
+ memcpy(&CHUNK, mSession, 1);
+ mSession += 1;
}
switch (CHUNK) {
case SET_PAL:
if (!UsingMem)
- _Sesion->read(dacSSN, 768);
+ _Session->read(dacSSN, 768);
else {
- memcpy(dacSSN, mSesion, 768);
- mSesion += 768;
+ memcpy(dacSSN, mSession, 768);
+ mSession += 768;
}
set_dacSSN(dacSSN);
break;
@@ -3318,22 +3318,22 @@
break;
case INIT_FRAME:
if (!UsingMem) {
- _Sesion->read(&CMP, 1);
- _Sesion->read(&Lengt, 4);
+ _Session->read(&CMP, 1);
+ _Session->read(&Lengt, 4);
} else {
- memcpy(&CMP, mSesion, 1);
- mSesion += 1;
- memcpy(&Lengt, mSesion, 4);
- mSesion += 4;
+ memcpy(&CMP, mSession, 1);
+ mSession += 1;
+ memcpy(&Lengt, mSession, 4);
+ mSession += 4;
}
if (CMP == CMP_RLE) {
if (!UsingMem) {
BufferSSN = (byte *)malloc(Lengt);
- _Sesion->read(BufferSSN, Lengt);
+ _Session->read(BufferSSN, Lengt);
} else {
BufferSSN = (byte *)malloc(Lengt);
- memcpy(BufferSSN, mSesion, Lengt);
- mSesion += Lengt;
+ memcpy(BufferSSN, mSession, Lengt);
+ mSession += Lengt;
}
Des_RLE(BufferSSN, MiVideoSSN);
free(BufferSSN);
@@ -3352,11 +3352,11 @@
if (CMP == CMP_OFF) {
if (!UsingMem) {
BufferSSN = (byte *)malloc(Lengt);
- _Sesion->read(BufferSSN, Lengt);
+ _Session->read(BufferSSN, Lengt);
} else {
BufferSSN = (byte *)malloc(Lengt);
- memcpy(BufferSSN, mSesion, Lengt);
- mSesion += Lengt;
+ memcpy(BufferSSN, mSession, Lengt);
+ mSession += Lengt;
}
Des_OFF(BufferSSN, MiVideoSSN, Lengt);
free(BufferSSN);
@@ -3390,24 +3390,24 @@
if (UsingMem)
free(pointer);
else {
- _Sesion->close();
- delete _Sesion;
+ _Session->close();
+ delete _Session;
}
}
-byte *DrasculaEngine::TryInMem(Common::File *Sesion) {
+byte *DrasculaEngine::TryInMem(Common::File *Session) {
int Lengt;
- Sesion->seek(0, SEEK_END);
- Lengt = Sesion->pos();
- Sesion->seek(0, SEEK_SET);
+ Session->seek(0, SEEK_END);
+ Lengt = Session->pos();
+ Session->seek(0, SEEK_SET);
pointer = (byte *)malloc(Lengt);
if (pointer == NULL)
return NULL;
- Sesion->read(pointer, Lengt);
+ Session->read(pointer, Lengt);
UsingMem = 1;
- Sesion->close();
- delete Sesion;
+ Session->close();
+ delete Session;
return pointer;
}
@@ -3458,9 +3458,9 @@
void DrasculaEngine::WaitFrameSSN() {
uint32 now;
- while ((now = _system->getMillis()) - LastFrame < ((uint32) GlobalSpeed))
- _system->delayMillis(GlobalSpeed - (now - LastFrame));
- LastFrame = LastFrame + GlobalSpeed;
+ while ((now = _system->getMillis()) - LastFrame < ((uint32) globalSpeed))
+ _system->delayMillis(globalSpeed - (now - LastFrame));
+ LastFrame = LastFrame + globalSpeed;
}
byte *DrasculaEngine::loadPCX(byte *NamePcc) {
@@ -3551,11 +3551,11 @@
if (distance_x < distance_y) {
direccion_hare = 0;
sentido_hare = 2;
- step_x = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
} else {
direccion_hare = 7;
sentido_hare = 0;
- step_y = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
}
}
@@ -3572,11 +3572,11 @@
if (distance_x < distance_y) {
direccion_hare = 1;
sentido_hare = 2;
- step_x = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
} else {
direccion_hare = 2;
sentido_hare = 1;
- step_y = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
}
}
@@ -3593,11 +3593,11 @@
if (distance_x < distance_y) {
direccion_hare = 5;
sentido_hare = 3;
- step_x = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
} else {
direccion_hare = 6;
sentido_hare = 0;
- step_y = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
}
}
@@ -3614,19 +3614,19 @@
if (distance_x < distance_y) {
direccion_hare = 4;
sentido_hare = 3;
- step_x = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
} else {
direccion_hare = 3;
sentido_hare = 1;
- step_y = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
}
}
-void DrasculaEngine::saveGame(char nom_game[]) {
+void DrasculaEngine::saveGame(char gameName[]) {
Common::OutSaveFile *out;
int l;
- if (!(out = _saveFileMan->openForSaving(nom_game))) {
+ if (!(out = _saveFileMan->openForSaving(gameName))) {
error("no puedo abrir el archivo");
}
out->writeSint32LE(num_ejec);
@@ -3643,17 +3643,17 @@
out->writeSint32LE(flags[l]);
}
- out->writeSint32LE(lleva_objeto);
+ out->writeSint32LE(takeObject);
out->writeSint32LE(pickedObject);
out->finalize();
if (out->ioFailed())
- warning("Can't write file '%s'. (Disk full?)", nom_game);
+ warning("Can't write file '%s'. (Disk full?)", gameName);
delete out;
}
-void DrasculaEngine::aumenta_num_frame() {
+void DrasculaEngine::increaseFrameNum() {
diff_vez = vez() - conta_vez;
if (diff_vez >= 6) {
@@ -3663,17 +3663,17 @@
num_frame = 0;
if (direccion_hare == 0 || direccion_hare == 7) {
- hare_x = hare_x - step_x;
- hare_y = hare_y - step_y;
+ hare_x = hare_x - stepX;
+ hare_y = hare_y - stepY;
} else if (direccion_hare == 1 || direccion_hare == 2) {
- hare_x = hare_x + step_x;
- hare_y = hare_y - step_y;
+ hare_x = hare_x + stepX;
+ hare_y = hare_y - stepY;
} else if (direccion_hare == 3 || direccion_hare == 4) {
- hare_x = hare_x + step_x;
- hare_y = hare_y + step_y;
+ hare_x = hare_x + stepX;
+ hare_y = hare_y + stepY;
} else if (direccion_hare == 5 || direccion_hare == 6) {
- hare_x = hare_x - step_x;
- hare_y = hare_y + step_y;
+ hare_x = hare_x - stepX;
+ hare_y = hare_y + stepY;
}
}
@@ -3685,7 +3685,7 @@
}
}
-int DrasculaEngine::sobre_que_objeto() {
+int DrasculaEngine::whichObject() {
int n = 0;
for (n = 1; n < 43; n++) {
@@ -3697,14 +3697,14 @@
return n;
}
-bool DrasculaEngine::comprueba_banderas_menu() {
+bool DrasculaEngine::checkMenuFlags() {
int h, n;
for (n = 0; n < 43; n++) {
- if (sobre_que_objeto() == n) {
+ if (whichObject() == n) {
h = inventoryObjects[n];
if (h != 0)
- if (banderas(h))
+ if (checkFlag(h))
return true;
}
}
@@ -3712,7 +3712,7 @@
return false;
}
-void DrasculaEngine::conversa(const char *nom_fich) {
+void DrasculaEngine::converse(const char *nom_fich) {
int h;
int game1 = 1, game2 = 1, game3 = 1, game4 = 1;
char phrase1[78];
@@ -3912,7 +3912,7 @@
goto bucle_opc;
if (num_ejec == 2)
- loadPic(fondo_y_menu);
+ loadPic(menuBackground);
else
loadPic("99.alg");
decompressPic(dir_hare_fondo, 1);
@@ -3984,7 +3984,7 @@
else if (c == 0xad)
x_de_letra = X_ABRE_EXCLAMACION_OPC;
else if (c == ';')
- x_de_letra = X_PUNTO_Y_COMA_OPC;
+ x_de_letra = X_pointY_COMA_OPC;
else if (c == '>')
x_de_letra = X_GREATER_THAN_OPC;
else if (c == '<')
@@ -4031,11 +4031,11 @@
void DrasculaEngine::response(int funcion) {
if (num_ejec == 1) {
if (funcion == 10)
- talk_borracho(_textb[_lang][1], "B1.als");
+ talk_drunk(_textb[_lang][1], "B1.als");
else if (funcion == 11)
- talk_borracho(_textb[_lang][2], "B2.als");
+ talk_drunk(_textb[_lang][2], "B2.als");
else if (funcion == 12)
- talk_borracho(_textb[_lang][3], "B3.als");
+ talk_drunk(_textb[_lang][3], "B3.als");
} else if (num_ejec == 2) {
if (funcion == 8)
animation_8_2();
@@ -4109,7 +4109,7 @@
}
}
-void DrasculaEngine::suma_objeto(int osj) {
+void DrasculaEngine::addObject(int osj) {
int h, position = 0;
for (h = 1; h < 43; h++) {
@@ -4262,13 +4262,13 @@
void DrasculaEngine::anda_pabajo() {
direccion_hare = 4;
sentido_hare = 3;
- step_x = 0;
+ stepX = 0;
}
void DrasculaEngine::anda_parriba() {
direccion_hare = 0;
sentido_hare = 2;
- step_x = 0;
+ stepX = 0;
}
void DrasculaEngine::pon_vb() {
@@ -4307,8 +4307,8 @@
copyRectClip(pos_vb, dir_hare_frente, dir_zona_pantalla);
}
-void DrasculaEngine::lleva_vb(int punto_x) {
- if (punto_x < vb_x)
+void DrasculaEngine::lleva_vb(int pointX) {
+ if (pointX < vb_x)
sentido_vb = 0;
else
sentido_vb = 1;
@@ -4320,11 +4320,11 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
if (sentido_vb == 0) {
vb_x = vb_x - 5;
- if (vb_x <= punto_x)
+ if (vb_x <= pointX)
break;
} else {
vb_x = vb_x + 5;
- if (vb_x >= punto_x)
+ if (vb_x >= pointX)
break;
}
pause(5);
@@ -4391,21 +4391,21 @@
}
}
-void DrasculaEngine::mapa() {
+void DrasculaEngine::showMap() {
int l, veo = 0;
for (l = 0; l < numRoomObjs; l++) {
if (mouseX > x1[l] && mouseY > y1[l]
&& mouseX < x2[l] && mouseY < y2[l]
&& visible[l] == 1) {
- strcpy(texto_nombre, objName[l]);
- hay_nombre = 1;
+ strcpy(textName, objName[l]);
+ hasName = 1;
veo = 1;
}
}
if (veo == 0)
- hay_nombre = 0;
+ hasName = 0;
}
void DrasculaEngine::grr() {
@@ -4428,12 +4428,12 @@
copyBackground(253, 110, 150, 65, 20, 30, dir_dibujo3, dir_zona_pantalla);
if (withVoices == 0)
- centra_texto(".groaaarrrrgghhh!", 153, 65);
+ centerText(".groaaarrrrgghhh!", 153, 65);
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
bucless:
- int key = getscan();
+ int key = getScan();
if (key != 0)
ctvd_stop();
if (hay_sb == 1) {
@@ -4452,7 +4452,7 @@
updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
}
-void DrasculaEngine::activa_pendulo() {
+void DrasculaEngine::activatePendulum() {
flags[1] = 2;
hare_se_ve = 0;
roomNumber = 102;
@@ -4467,7 +4467,7 @@
copyBackground(0, 171, 0, 0, OBJWIDTH, OBJHEIGHT, dir_hare_fondo, dir_dibujo3);
- conta_ciego_vez = vez();
+ conta_blind_vez = vez();
}
void DrasculaEngine::closeDoor(int nflag, int doorNum) {
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-29 22:07:25 UTC (rev 32371)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-29 22:34:03 UTC (rev 32372)
@@ -116,7 +116,7 @@
#define X_COMILLAS 51
#define X_CIERRA_EXCLAMACION 60
#define X_ABRE_EXCLAMACION 69
-#define X_PUNTO_Y_COMA 78
+#define X_pointY_COMA 78
#define X_GREATER_THAN 87
#define X_LESSER_THAN 96
#define X_DOLAR 105
@@ -179,7 +179,7 @@
#define X_COMILLAS_OPC 45
#define X_CIERRA_EXCLAMACION_OPC 52
#define X_ABRE_EXCLAMACION_OPC 59
-#define X_PUNTO_Y_COMA_OPC 66
+#define X_pointY_COMA_OPC 66
#define X_GREATER_THAN_OPC 73
#define X_LESSER_THAN_OPC 80
#define X_DOLAR_OPC 87
@@ -271,11 +271,10 @@
byte *dir_zona_pantalla;
byte *dir_hare_frente;
byte *dir_texto;
- byte *dir_pendulo;
+ byte *dir_pendulum;
byte cPal[768];
- byte *Buffer_pcx;
- long LenFile;
+ byte *pcxBuffer;
Common::File *ald, *sku;
@@ -285,24 +284,24 @@
char roomDisk[20];
char currentData[20];
int numRoomObjs;
- char fondo_y_menu[20];
+ char menuBackground[20];
char objName[30][20];
char iconName[44][13];
- int num_obj[40], visible[40], isDoor[40];
+ int objectNum[40], visible[40], isDoor[40];
int sitiobj_x[40], sitiobj_y[40], sentidobj[40];
int inventoryObjects[43];
- char alapantallakeva[40][20];
+ char targetScreen[40][20];
int x_alakeva[40], y_alakeva[40], sentido_alkeva[40], alapuertakeva[40];
int x1[40], y1[40], x2[40], y2[40];
- int lleva_objeto, pickedObject;
+ int takeObject, pickedObject;
int withVoices;
- int menu_bar, menu_scr, hay_nombre;
- char texto_nombre[20];
- int frame_ciego;
- int frame_ronquido;
- int frame_murcielago;
+ int menuBar, menuScreen, hasName;
+ char textName[20];
+ int frame_blind;
+ int frame_snore;
+ int frame_bat;
int c_mirar;
int c_poder;
@@ -310,28 +309,28 @@
int frame_y;
int hare_x, hare_y, hare_se_mueve, direccion_hare, sentido_hare, num_frame, hare_se_ve;
- int sitio_x, sitio_y, comprueba_flags;
+ int sitio_x, sitio_y, checkFlags;
int rompo, rompo2;
- int step_x, step_y;
- int alto_hare, ancho_hare, alto_pies;
+ int stepX, stepY;
+ int alto_hare, ancho_hare, feetHeight;
int alto_talk, ancho_talk;
int suelo_x1, suelo_y1, suelo_x2, suelo_y2;
int near, far;
- int sentido_final, anda_a_objeto;
- int obj_saliendo;
+ int sentido_final, walkToObject;
+ int objExit;
int diff_vez, conta_vez;
- int hay_answer;
- int conta_ciego_vez;
- int cambio_de_color;
+ int hasAnswer;
+ int conta_blind_vez;
+ int changeColor;
int rompo_y_salgo;
int vb_x, sentido_vb, vb_se_mueve, frame_vb;
float newHeight, newWidth;
int factor_red[202];
int frame_piano;
- int frame_borracho;
+ int frame_drunk;
int frame_velas;
int color_solo;
- int parpadeo;
+ int blinking;
int x_igor, y_igor, sentido_igor;
int x_dr, y_dr, sentido_dr;
int x_bj, y_bj, sentido_bj;
@@ -339,9 +338,9 @@
int term_int;
int num_ejec;
int hay_que_load;
- char nom_partida[13];
+ char saveName[13];
int _color;
- int corta_musica;
+ int musicStopped;
char select[23];
int hay_seleccion;
int mouseX;
@@ -356,16 +355,16 @@
void talk_vb(const char *, const char *);
void talk_vbpuerta(int);
void talk_vbpuerta(const char *said, const char *filename);
- void talk_ciego(const char *, const char *, const char *);
+ void talk_blind(const char *, const char *, const char *);
void talk_hacker(const char *, const char *);
void pickObject(int);
void anda_parriba();
void anda_pabajo();
void pon_vb();
- void lleva_vb(int punto_x);
+ void lleva_vb(int pointX);
void hipo_sin_nadie(int counter);
void openDoor(int nflag, int doorNum);
- void mapa();
+ void showMap();
void animation_1_1();
void animation_2_1();
void animation_1_2();
@@ -452,36 +451,36 @@
void carga_escoba(const char *);
void clearRoom();
void lleva_al_hare(int, int);
- void mueve_cursor();
- void comprueba_objetos();
+ void moveCursor();
+ void checkObjects();
void elige_en_barra();
bool comprueba1();
bool comprueba2();
- Common::KeyCode getscan();
- void elige_verbo(int);
+ Common::KeyCode getScan();
+ void selectVerb(int);
void mesa();
bool saves();
void print_abc(const char *, int, int);
void delay(int ms);
bool confirma_salir();
- void salva_pantallas();
+ void screenSaver();
void chooseObject(int objeto);
- void suma_objeto(int);
- int resta_objeto(int osj);
+ void addObject(int);
+ int removeObject(int osj);
void fliplay(const char *filefli, int vel);
- void FundeDelNegro(int VelocidadDeFundido);
- char LimitaVGA(char valor);
+ void fadeFromBlack(int VelocidadDeFundido);
+ char LimitaVGA(char value);
void color_abc(int cl);
- void centra_texto(const char *,int,int);
+ void centerText(const char *,int,int);
void playSound(const char *);
bool anima(const char *animation, int FPS);
void stopSound_corte();
- void FundeAlNegro(int VelocidadDeFundido);
+ void fadeToBlack(int VelocidadDeFundido);
void pause(int);
void talk_dr_grande(const char *said, const char *filename);
- void pon_igor();
- void pon_bj();
- void pon_dr();
+ 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);
@@ -495,7 +494,7 @@
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 hipo(int);
+ void hiccup(int);
void stopSound();
void talk_bj(int);
void talk_bj(const char *, const char *);
@@ -508,7 +507,7 @@
void stopMusic();
int musicStatus();
void updateRoom();
- bool carga_partida(const char *);
+ bool loadGame(const char *);
void updateDoor(int);
void animastopSound_corte();
void color_hare();
@@ -517,18 +516,18 @@
void paleta_hare_oscuro();
void hare_claro();
void updateData();
- void empieza_andar();
+ void startWalking();
void updateRefresh();
void updateRefresh_pre();
void pon_hare();
void menu_sin_volcar();
- void barra_menu();
+ void clearMenu();
void removeObject();
- bool sal_de_la_habitacion(int);
- bool coge_objeto();
- bool banderas(int);
- void cursor_mesa();
- void introduce_nombre();
+ bool exitRoom(int);
+ bool pickupObject();
+ bool checkFlag(int);
+ void setCursorTable();
+ void enterName();
void para_grabar(char[]);
int LookForFree();
void OpenSSN(const char *Name, int Pause);
@@ -537,7 +536,7 @@
void Des_RLE(byte *BufferRLE, byte *MiVideoRLE);
void Des_OFF(byte *BufferOFF, byte *MiVideoOFF, int Lenght);
void set_dacSSN(byte *dacSSN);
- byte *TryInMem(Common::File *Sesion);
+ byte *TryInMem(Common::File *Session);
void EndSSN();
int PlayFrameSSN();
@@ -548,13 +547,13 @@
byte *pointer;
int UsingMem;
- Common::File *_Sesion;
+ Common::File *_Session;
byte CHUNK;
byte CMP, dacSSN[768];
byte *MiVideoSSN;
- byte *mSesion;
+ byte *mSession;
int FrameSSN;
- int GlobalSpeed;
+ int globalSpeed;
uint32 LastFrame;
int frame_pen;
@@ -574,9 +573,9 @@
void update_62_pre();
void update_63();
void saveGame(char[]);
- void aumenta_num_frame();
- int sobre_que_objeto();
- bool comprueba_banderas_menu();
+ void increaseFrameNum();
+ int whichObject();
+ bool checkMenuFlags();
bool roomParse(RoomTalkAction*, int);
void room_0();
void room_1(int);
@@ -609,10 +608,10 @@
void room_44(int);
void room_62(int);
void room_63(int);
- void conversa(const char *);
+ void converse(const char *);
void print_abc_opc(const char *, int, int, int);
void response(int);
- void talk_borracho(const char *said, const char *filename);
+ void talk_drunk(const char *said, const char *filename);
void talk_pianista(const char *said, const char *filename);
void MusicFadeout();
@@ -670,15 +669,15 @@
void update_56_pre();
void update_50();
void update_57();
- void talk_igor_sentado(const char *, const char *);
- void talk_lobo(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 room_58(int);
void room_59(int);
bool room_60(int);
void room_61(int);
- void room_pendulo(int);
- void update_pendulo();
+ void room_pendulum(int);
@@ Diff output truncated at 100000 characters. @@
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