comienza_sound -> playSound

fin_sound -> stopSound
comienza_sound -> playSound
n_puerta -> doorNum
cierra_puerta -> closeDoor

svn-id: r32314

4 files changed, 97 insertions, 97 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 8647294a97..0ec6845251 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -81,12 +81,12 @@ void DrasculaEngine::animation_1_1() {
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		clearRoom();
-		comienza_sound("s5.als");
+		playSound("s5.als");
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		if (anima("scr2.bin", 17))
 			break;
-		fin_sound_corte();
+		stopSound_corte();
 		if (anima("scr3.bin", 17))
 			break;
 		loadPic("cielo2.alg");
@@ -265,7 +265,7 @@ void DrasculaEngine::animation_1_1() {
 			break;
 		if (anima("rayo1.bin", 16))
 			break;
-		comienza_sound("s5.als");
+		playSound("s5.als");
 		if (anima("rayo2.bin", 15))
 			break;
 		if (anima("frel2.bin", 16))
@@ -274,7 +274,7 @@ void DrasculaEngine::animation_1_1() {
 			break;
 		if (anima("frel.bin", 16))
 			break;
-		fin_sound_corte();
+		stopSound_corte();
 		clearRoom();
 		black();
 		playMusic(23);
@@ -469,9 +469,9 @@ void DrasculaEngine::animation_2_1() {
 			break;
 
 		pause(4);
-		comienza_sound("s1.als");
+		playSound("s1.als");
 		hipo(18);
-		fin_sound();
+		stopSound();
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 
@@ -774,7 +774,7 @@ void DrasculaEngine::animation_2_2() {
 	}
 
 	x = 0;
-	comienza_sound("s2.als");
+	playSound("s2.als");
 
 	for (n = 0; n < 6; n++) {
 		x++;
@@ -806,13 +806,13 @@ void DrasculaEngine::animation_2_2() {
 	copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
-	fin_sound();
+	stopSound();
 
 	pause (4);
 
-	comienza_sound("s1.als");
+	playSound("s1.als");
 	hipo_sin_nadie(12);
-	fin_sound();
+	stopSound();
 }
 
 void DrasculaEngine::animation_3_2() {
@@ -958,10 +958,10 @@ void DrasculaEngine::animation_14_2() {
 
 	decompressPic(dir_dibujo1, 1);
 
-	comienza_sound("s7.als");
+	playSound("s7.als");
 	hipo(15);
 
-	fin_sound();
+	stopSound();
 
 	loadPic("99.alg");
 	decompressPic(dir_hare_fondo, 1);
@@ -1294,7 +1294,7 @@ void DrasculaEngine::animation_25_2() {
 
 	flags[24] = 0;
 
-	comienza_sound("s6.als");
+	playSound("s6.als");
 
 	for (n = 0; n >= -160; n = n - 8) {
 		copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -1311,7 +1311,7 @@ void DrasculaEngine::animation_25_2() {
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	}
 
-	fin_sound();
+	stopSound();
 
 	loadPic("99.alg");
 	decompressPic(dir_hare_fondo, 1);
@@ -1484,9 +1484,9 @@ void DrasculaEngine::animation_35_2() {
 
 	pause(19);
 
-	comienza_sound("s1.als");
+	playSound("s1.als");
 	hipo_sin_nadie(18);
-	fin_sound();
+	stopSound();
 
 	pause(10);
 
@@ -1798,7 +1798,7 @@ void DrasculaEngine::animation_rayo() {
 
 	pause(50);
 
-	comienza_sound("s5.als");
+	playSound("s5.als");
 
 	updateScreen(0, 0, 0, 0, 320, 200, dir_hare_dch);
 	pause(3);
@@ -1811,7 +1811,7 @@ void DrasculaEngine::animation_rayo() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_dibujo3);
 	pause(3);
 	updateScreen(0, 0, 0, 0, 320, 200, dir_hare_frente);
-	fin_sound();
+	stopSound();
 }
 
 void DrasculaEngine::animation_2_4() {
@@ -1991,8 +1991,8 @@ void DrasculaEngine::animation_5_5(){
 	}
 	updateScreen(0, 0, 0, 0, 320, 200, dir_dibujo1);
 
-	comienza_sound("s1.als");
-	fin_sound();
+	playSound("s1.als");
+	stopSound();
 
 	loadPic("99.alg");
 	decompressPic(dir_hare_fondo, 1);
@@ -2068,7 +2068,7 @@ void DrasculaEngine::animation_12_5() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	pause(27);
 	anima("rayo1.bin", 23);
-	comienza_sound("s5.als");
+	playSound("s5.als");
 	anima("rayo2.bin", 17);
 	sentido_hare = 1;
 	updateRoom();
@@ -2119,7 +2119,7 @@ void DrasculaEngine::animation_12_5() {
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	}
 
-	fin_sound_corte();
+	stopSound_corte();
 
 	for (frame = 0; frame < 15; frame++) {
 		if (frame == 2 || frame == 4 || frame == 7 || frame == 9)
@@ -2143,9 +2143,9 @@ void DrasculaEngine::animation_12_5() {
 	flags[1] = 1;
 
 	animation_13_5();
-	comienza_sound("s1.als");
+	playSound("s1.als");
 	hipo(12);
-	fin_sound();
+	stopSound();
 
 	loadPic("99.alg");
 	decompressPic(dir_hare_fondo, 1);
@@ -2209,19 +2209,19 @@ void DrasculaEngine::animation_13_5() {
 
 void DrasculaEngine::animation_14_5() {
 	flags[11] = 1;
-	comienza_sound("s3.als");
+	playSound("s3.als");
 	updateRoom();
 	updateScreen(0, 0, 0,0 , 320, 200, dir_zona_pantalla);
-	fin_sound();
+	stopSound();
 	pause(17);
 	sentido_hare = 3;
 	talk(_text[_lang][246],"246.als");
 	lleva_al_hare(89, 160);
 	flags[10] = 1;
-	comienza_sound("s7.als");
+	playSound("s7.als");
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	fin_sound();
+	stopSound();
 	pause(14);
 	sentido_hare = 3;
 	updateRoom();
@@ -2474,12 +2474,12 @@ void DrasculaEngine::animation_9_6() {
 }
 
 void DrasculaEngine::animation_10_6() {
-	comienza_sound ("s14.als");
+	playSound ("s14.als");
 	copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
 	updateRefresh_pre();
 	copyBackground(164, 85, 155, 48, 113, 114, dir_dibujo3, dir_zona_pantalla);
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	fin_sound();
+	stopSound();
 	talk_taber2(_textt[_lang][23], "t23.als");
 	flags[7] = 1;
 }
@@ -2529,9 +2529,9 @@ void DrasculaEngine::animation_19_6() {
 	pause(6);
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	comienza_sound("s4.als");
+	playSound("s4.als");
 	pause(6);
-	fin_sound();
+	stopSound();
 }
 
 void DrasculaEngine::animation_12_2() {
@@ -2624,11 +2624,11 @@ void DrasculaEngine::animation_26_2() {
 		updateScreen(225, 113, 225, 113, 50, 59, dir_zona_pantalla);
 		x = x + 50;
 		if (n == 2)
-			comienza_sound("s9.als");
+			playSound("s9.als");
 		pause(3);
 	}
 
-	fin_sound_corte();
+	stopSound_corte();
 	x = 0;
 	for (n = 0; n < 6; n++) {
 		x++;
@@ -2709,8 +2709,8 @@ void DrasculaEngine::animation_22_2() {
 	sentido_hare=2;
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	comienza_sound("s13.als");
-	fin_sound();
+	playSound("s13.als");
+	stopSound();
 	sentido_hare = 1;
 
 	talk_vbpuerta(1);
@@ -2832,7 +2832,7 @@ void DrasculaEngine::animation_34_2() {
 	}
 
 	x = 0;
-	comienza_sound("s8.als");
+	playSound("s8.als");
 
 	for (n = 0; n < 3; n++) {
 		x++;
@@ -2841,7 +2841,7 @@ void DrasculaEngine::animation_34_2() {
 		x = x + 83;
 		pause(3);
 	}
-	fin_sound();
+	stopSound();
 
 	pause(30);
 
@@ -3199,7 +3199,7 @@ void DrasculaEngine::animation_5_2() {
 		pause(3);
 	}
 
-	comienza_sound("s1.als");
+	playSound("s1.als");
 
 	x = 0;
 
@@ -3210,7 +3210,7 @@ void DrasculaEngine::animation_5_2() {
 		x = x + 52;
 		pause(3);
 	}
-	fin_sound_corte();
+	stopSound_corte();
 
 	x = 0;
 
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 8a472c280d..41f6a3fde8 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -2115,7 +2115,7 @@ imprimir:
 	}
 }
 
-void DrasculaEngine::comienza_sound(const char *fichero) {
+void DrasculaEngine::playSound(const char *fichero) {
 	if (hay_sb == 1) {
 		sku = new Common::File;
 		sku->open(fichero);
@@ -2183,7 +2183,7 @@ bool DrasculaEngine::anima(const char *animation, int FPS) {
 	return ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE));
 }
 
-void DrasculaEngine::animafin_sound_corte() {
+void DrasculaEngine::animastopSound_corte() {
 	if (hay_sb == 1) {
 		ctvd_stop();
 		delete sku;
@@ -2308,7 +2308,7 @@ comienza:
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 }
 
-void DrasculaEngine::fin_sound() {
+void DrasculaEngine::stopSound() {
 	delay(1);
 
 	if (hay_sb == 1) {
@@ -3363,8 +3363,8 @@ void DrasculaEngine::introduce_nombre() {
 
 void DrasculaEngine::para_grabar(char nom_game[]) {
 	saveGame(nom_game);
-	comienza_sound("99.als");
-	fin_sound();
+	playSound("99.als");
+	stopSound();
 }
 
 void DrasculaEngine::OpenSSN(const char *Name, int Pause) {
@@ -4289,7 +4289,7 @@ void DrasculaEngine::suma_objeto(int osj) {
 	}
 }
 
-void DrasculaEngine::fin_sound_corte() {
+void DrasculaEngine::stopSound_corte() {
 	if (hay_sb == 1) {
 		ctvd_stop();
 		delete sku;
@@ -4531,23 +4531,23 @@ comienza:
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 }
 
-void DrasculaEngine::openDoor(int nflag, int n_puerta) {
+void DrasculaEngine::openDoor(int nflag, int doorNum) {
 	if (flags[nflag] == 0) {
 		if (num_ejec == 1 /*|| num_ejec == 4*/) {
 			if (nflag != 7) {
-				comienza_sound("s3.als");
+				playSound("s3.als");
 				flags[nflag] = 1;
 			}
 		} else {
-			comienza_sound("s3.als");
+			playSound("s3.als");
 			flags[nflag] = 1;
 		}
 
-		if (n_puerta != NO_DOOR)
-			puertas_cerradas(n_puerta);
+		if (doorNum != NO_DOOR)
+			puertas_cerradas(doorNum);
 		updateRoom();
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-		fin_sound();
+		stopSound();
 		withoutVerb();
 	}
 }
@@ -4631,15 +4631,15 @@ void DrasculaEngine::activa_pendulo() {
 	conta_ciego_vez = vez();
 }
 
-void DrasculaEngine::cierra_puerta(int nflag, int n_puerta) {
+void DrasculaEngine::closeDoor(int nflag, int doorNum) {
 	if (flags[nflag] == 1) {
-		comienza_sound("s4.als");
+		playSound("s4.als");
 		flags[nflag] = 0;
-		if (n_puerta != NO_DOOR)
-			puertas_cerradas(n_puerta);
+		if (doorNum != NO_DOOR)
+			puertas_cerradas(doorNum);
 		updateRoom();
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-		fin_sound();
+		stopSound();
 		withoutVerb();
 	}
 }
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 39e7fb2b78..b015074172 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -406,7 +406,7 @@ public:
 	void pon_vb();
 	void lleva_vb(int punto_x);
 	void hipo_sin_nadie(int counter);
-	void openDoor(int nflag, int n_puerta);
+	void openDoor(int nflag, int doorNum);
 	void mapa();
 	void animation_1_1();
 	void animation_2_1();
@@ -517,9 +517,9 @@ public:
 	char LimitaVGA(char valor);
 	void color_abc(int cl);
 	void centra_texto(const char *,int,int);
-	void comienza_sound(const char *);
+	void playSound(const char *);
 	bool anima(const char *animation, int FPS);
-	void fin_sound_corte();
+	void stopSound_corte();
 	void FundeAlNegro(int VelocidadDeFundido);
 	void pause(int);
 	void talk_dr_grande(const char *said, const char *filename);
@@ -536,20 +536,20 @@ public:
 	void talk_igorpuerta(const char *said, const char *filename);
 	void talk_igor_peluca(const char *said, const char *filename);
 	void hipo(int);
-	void fin_sound();
+	void stopSound();
 	void talk_bj(const char *, const char *);
 	void talk_baul(const char *said, const char *filename);
 	void talk(int);
 	void talk(const char *, const char *);
 	void talk_sinc(const char *, const char *, const char *);
-	void cierra_puerta(int nflag, int n_puerta);
+	void closeDoor(int nflag, int doorNum);
 	void playMusic(int p);
 	void stopMusic();
 	int musicStatus();
 	void updateRoom();
 	bool carga_partida(const char *);
 	void puertas_cerradas(int);
-	void animafin_sound_corte();
+	void animastopSound_corte();
 	void color_hare();
 	void funde_hare(int oscuridad);
 	void paleta_hare_claro();
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 6098e5fba6..f97c31566b 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -357,7 +357,7 @@ void DrasculaEngine::room_6(int fl){
 	else if (objeto_que_lleva == OPEN && fl == 138)
 		openDoor(0, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 138)
-		cierra_puerta(0, 1);
+		closeDoor(0, 1);
 	else if (objeto_que_lleva == TALK && fl == 138)
 		talk(6);
 	else if (objeto_que_lleva == LOOK && fl == 143)
@@ -372,11 +372,11 @@ void DrasculaEngine::room_6(int fl){
 	copyRect(228, 102, hare_x + 5, hare_y - 1, 47, 73, dir_dibujo3, dir_zona_pantalla);
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	pause(10);
-	comienza_sound("s3.als");
+	playSound("s3.als");
 	flags[2] = 1;
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	fin_sound();
+	stopSound();
 	} else if (objeto_que_lleva == CLOSE && fl == 143 && flags[2] == 1) {
 		copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
 		flags[2] = 0;
@@ -384,10 +384,10 @@ void DrasculaEngine::room_6(int fl){
 		copyRect(228, 102, hare_x + 5, hare_y - 1, 47, 73, dir_dibujo3, dir_zona_pantalla);
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 		pause(5);
-		comienza_sound("s4.als");
+		playSound("s4.als");
 		updateRoom();
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-		fin_sound();
+		stopSound();
 	} else if (objeto_que_lleva == TALK && fl == 143)
 		talk(38);
 	else if (objeto_que_lleva == LOOK && fl == 139)
@@ -398,13 +398,13 @@ void DrasculaEngine::room_6(int fl){
 		copyRect(267, 1, hare_x - 14, hare_y - 2, 52, 73, dir_dibujo3, dir_zona_pantalla);
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 		pause(19);
-		comienza_sound("s3.als");
+		playSound("s3.als");
 		flags[1] = 1;
 		visible[4] = 1;
 		visible[2] = 0;
 		updateRoom();
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-		fin_sound();
+		stopSound();
 	} else if (objeto_que_lleva == LOOK && fl == 140)
 		talk(147);
 	else if (objeto_que_lleva == PICK && fl == 140) {
@@ -487,7 +487,7 @@ void DrasculaEngine::room_12(int fl){
 	else if (objeto_que_lleva == OPEN && fl == 156)
 		openDoor(16, 4);
 	else if (objeto_que_lleva == CLOSE && fl == 156)
-		cierra_puerta(16, 4);
+		closeDoor(16, 4);
 	else
 		hay_respuesta = 0;
 }
@@ -560,8 +560,8 @@ void DrasculaEngine::room_15(int fl) {
 		copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
 		copyRect(133, 135, hare_x + 6, hare_y, 39, 63, dir_dibujo3, dir_zona_pantalla);
 		updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-		comienza_sound("s8.als");
-		fin_sound();
+		playSound("s8.als");
+		stopSound();
 		talk(_text[_lang][338], "338.als");
 		flags[27] = 0;
 		pickObject(19);
@@ -592,7 +592,7 @@ void DrasculaEngine::room_16(int fl) {
 	else if (objeto_que_lleva == OPEN && fl == 163)
 		openDoor(17, 0);
 	else if (objeto_que_lleva == CLOSE && fl == 163)
-		cierra_puerta(17, 0);
+		closeDoor(17, 0);
 	else if (objeto_que_lleva == LOOK && fl == 183)
 		talk(_text[_lang][340], "340.als");
 	else if (objeto_que_lleva == TALK && fl == 183) {
@@ -612,7 +612,7 @@ void DrasculaEngine::room_16(int fl) {
 			pickObject(22);
 		}
 	} else if (objeto_que_lleva == CLOSE && fl == 183)
-		cierra_puerta(19, NO_DOOR);
+		closeDoor(19, NO_DOOR);
 	else if (objeto_que_lleva == LOOK && fl == 185)
 		talk(_text[_lang][37], "37.als");
 	else if (objeto_que_lleva == PICK && fl == 185)
@@ -647,7 +647,7 @@ void DrasculaEngine::room_17(int fl) {
 	else if (objeto_que_lleva == OPEN && fl == 177 && flags[14] == 1)
 		openDoor(15, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 177 && flags[14] == 1)
-		cierra_puerta(15, 1);
+		closeDoor(15, 1);
 	else if (objeto_que_lleva == 11 && fl == 50 && flags[22] == 0) {
 		talk(_text[_lang][347], "347.als");
 		flags[29] = 1;
@@ -727,7 +727,7 @@ bool DrasculaEngine::room_21(int fl) {
 	else if (objeto_que_lleva == OPEN && fl == 101 && flags[28] == 1)
 		openDoor(0, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 101)
-		cierra_puerta(0, 1);
+		closeDoor(0, 1);
 	else if(objeto_que_lleva == PICK && fl == 141) {
 		pickObject(19);
 		visible[2] = 0;
@@ -755,9 +755,9 @@ void DrasculaEngine::room_22(int fl) {
 	} else if (objeto_que_lleva == 22 && fl == 52) {
 		anima("up.bin",14);
 		flags[26]=1;
-		comienza_sound("s1.als");
+		playSound("s1.als");
 		hipo(14);
-		fin_sound();
+		stopSound();
 		withoutVerb();
 		resta_objeto(22);
 		updateData();
@@ -783,12 +783,12 @@ void DrasculaEngine::room_23(int fl) {
 		openDoor(0, 0);
 		updateData();
 	} else if(objeto_que_lleva == CLOSE && fl == 103) {
-		cierra_puerta(0, 0);
+		closeDoor(0, 0);
 		updateData();
 	} else if(objeto_que_lleva == OPEN && fl == 104)
 		openDoor(1, 1);
 	else if(objeto_que_lleva == CLOSE && fl == 104)
-		cierra_puerta(1, 1);
+		closeDoor(1, 1);
 	else if(objeto_que_lleva == PICK && fl == 142) {
 		pickObject(8);
 		visible[2] = 0;
@@ -805,11 +805,11 @@ void DrasculaEngine::room_24(int fl) {
 	if (objeto_que_lleva == OPEN && fl == 105)
 		openDoor(1, 0);
 	else if (objeto_que_lleva == CLOSE && fl == 105)
-		cierra_puerta(1, 0);
+		closeDoor(1, 0);
 	else if (objeto_que_lleva == OPEN && fl == 106)
 		openDoor(2, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 106)
-		cierra_puerta(2, 1);
+		closeDoor(2, 1);
 	else if (objeto_que_lleva == LOOK && fl == 151)
 		talk(_text[_lang][461], "461.als");
 	else
@@ -822,7 +822,7 @@ void DrasculaEngine::room_26(int fl) {
 	else if (objeto_que_lleva == OPEN && fl == 107 && flags[30] == 1)
 		talk(_text[_lang][421], "421.als");
 	else if (objeto_que_lleva == CLOSE && fl == 107)
-		cierra_puerta(2, 0);
+		closeDoor(2, 0);
 	else if (objeto_que_lleva == 10 && fl == 50 && flags[18] == 1 && flags[12] == 1)
 		animation_5_4();
 	else if (objeto_que_lleva == 8 && fl == 50 && flags[18] == 1 && flags[12] == 1)
@@ -836,7 +836,7 @@ void DrasculaEngine::room_26(int fl) {
 		pickObject(10);
 		visible[1] = 0;
 		flags[12] = 1;
-		cierra_puerta(2, 0);
+		closeDoor(2, 0);
 		sentido_hare = 2;
 		talk_igorpuerta(_texti[_lang][27], "I27.als");
 		flags[30] = 1;
@@ -875,7 +875,7 @@ void DrasculaEngine::room_27(int fl) {
 	if (objeto_que_lleva == OPEN && fl == 110)
 		openDoor(6, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 110)
-		cierra_puerta(6, 1);
+		closeDoor(6, 1);
 	else if (objeto_que_lleva == OPEN && fl == 116 && flags[23] == 0)
 		talk(_text[_lang][419], "419.als");
 	else if (objeto_que_lleva == OPEN && fl == 116 && flags[23] == 1)
@@ -896,7 +896,7 @@ void DrasculaEngine::room_29(int fl) {
 	if (objeto_que_lleva == OPEN && fl == 114)
 		openDoor(4, 1);
 	else if (objeto_que_lleva == CLOSE && fl == 114)
-		cierra_puerta(4, 1);
+		closeDoor(4, 1);
 	else if (objeto_que_lleva == LOOK && fl == 152)
 		talk(_text[_lang][463], "463.als");
 	else if (objeto_que_lleva == OPEN && fl == 152)
@@ -915,7 +915,7 @@ void DrasculaEngine::room_30(int fl) {
 	if (objeto_que_lleva == OPEN && fl == 115)
 		openDoor(4, 0);
 	else if (objeto_que_lleva == CLOSE && fl == 115)
-		cierra_puerta(4, 0);
+		closeDoor(4, 0);
 	else if (objeto_que_lleva == OPEN && fl == 144 && flags[19] == 0)
 		talk(_text[_lang][422], "422.als");
 	else if (objeto_que_lleva == OPEN && fl == 144 && flags[19] == 1 && flags[22] == 1)
@@ -930,7 +930,7 @@ void DrasculaEngine::room_30(int fl) {
 		if (flags[18] == 1)
 			animation_6_4();
 	} else if (objeto_que_lleva == CLOSE && fl == 144)
-		cierra_puerta(16, 1);
+		closeDoor(16, 1);
 	else if (objeto_que_lleva == 13 && fl == 144) {
 		talk(_text[_lang][424], "424.als");
 		flags[19] = 1;
@@ -950,7 +950,7 @@ void DrasculaEngine::room_31(int fl) {
 	} else if (objeto_que_lleva == OPEN && fl == 117)
 		openDoor(5, 0);
 	else if (objeto_que_lleva == CLOSE && fl == 117)
-		cierra_puerta(5, 0);
+		closeDoor(5, 0);
 	else if (objeto_que_lleva == LOOK && fl == 161)
 		talk(_text[_lang][470], "470.als");
 	else if (objeto_que_lleva == OPEN && fl == 161)
@@ -975,7 +975,7 @@ void DrasculaEngine::room_34(int fl) {
 		pickObject(14);
 		flags[25] = 1;
 	} else if (objeto_que_lleva == CLOSE && fl == 120)
-		cierra_puerta(8, 2);
+		closeDoor(8, 2);
 	else
 		hay_respuesta=0;
 }
@@ -1110,9 +1110,9 @@ void DrasculaEngine::room_55(int fl) {
 	else if (objeto_que_lleva == LOOK && fl == 205)
 		talk(_text[_lang][140], "140.als");
 	else if (fl == 206) {
-		comienza_sound("s11.als");
+		playSound("s11.als");
 		anima("det.bin", 17);
-		fin_sound();
+		stopSound();
 		lleva_al_hare(hare_x - 3, hare_y + alto_hare + 6);
 	} else
 		hay_respuesta = 0;
@@ -1156,18 +1156,18 @@ void DrasculaEngine::room_59(int fl) {
 		talk(_text[_lang][265], "265.als");
 		flags[9] = 0;
 		if (flags[11] == 0) {
-			comienza_sound("s12.als");
+			playSound("s12.als");
 			delay(40);
-			fin_sound();
+			stopSound();
 			delay(10);
 			lleva_al_hare(174, 168);
 			sentido_hare = 2;
 			updateRoom();
 			updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 			pause(40);
-			comienza_sound("s12.als");
+			playSound("s12.als");
 			pause(19);
-			fin_sound_corte();
+			stopSound_corte();
 			hare_se_ve = 0;
 			updateRoom();
 			copyRect(101, 34, hare_x - 4, hare_y - 1, 37, 70, dir_dibujo3, dir_zona_pantalla);