salir_al_dos -> releaseGame

stopmusic -> stopMusic
music_status -> musicStatus
playmusic -> playMusic

svn-id: r32006

4 files changed, 76 insertions, 76 deletions

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index e7205fe984..b936e8c129 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -35,7 +35,7 @@ void DrasculaEngine::animation_1_1() {
 	int pos_pixel[6];
 
 	while (term_int == 0) {
-		playmusic(29);
+		playMusic(29);
 		fliplay("logoddm.bin", 9);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
@@ -46,7 +46,7 @@ void DrasculaEngine::animation_1_1() {
 		delay(340);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
-		playmusic(26);
+		playMusic(26);
 		delay(500);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
@@ -110,7 +110,7 @@ void DrasculaEngine::animation_1_1() {
 		loadPic("aux104.alg");
 		decompressPic(dir_dibujo2, 1);
 
-		playmusic(4);
+		playMusic(4);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		delay(400);
@@ -253,7 +253,7 @@ void DrasculaEngine::animation_1_1() {
 		loadPic("100.alg");
 		decompressPic(dir_dibujo1, MEDIA);
 		MusicFadeout();
-		stopmusic();
+		stopMusic();
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		talk_igor_dch(_texti[_lang][9], "I9.als");
@@ -265,7 +265,7 @@ void DrasculaEngine::animation_1_1() {
 		talk_igor_dch(_texti[_lang][10], "I10.als");
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
-		playmusic(11);
+		playMusic(11);
 		talk_dr_izq(_textd[_lang][10], "d10.als");
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
@@ -288,7 +288,7 @@ void DrasculaEngine::animation_1_1() {
 		fin_sound_corte();
 		clearRoom();
 		Negro();
-		playmusic(23);
+		playMusic(23);
 		FundeDelNegro(0);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
@@ -375,7 +375,7 @@ void DrasculaEngine::animation_1_1() {
 			break;
 		clearRoom();
 
-		playmusic(2);
+		playMusic(2);
 		pause(5);
 		fliplay("intro.bin", 12);
 		term_int = 1;
@@ -488,7 +488,7 @@ void DrasculaEngine::animation_2_1() {
 			break;
 
 		clearRoom();
-		stopmusic();
+		stopMusic();
 		corta_musica = 1;
 		memset(dir_zona_pantalla, 0, 64000);
 		color_solo = BLANCO;
@@ -575,7 +575,7 @@ void DrasculaEngine::animation_2_1() {
 		talk(_text[_lang][222], "222.als");
 		anima("gaf.bin", 15);
 		anima("bjb.bin", 14);
-		playmusic(9);
+		playMusic(9);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		loadPic("97.alg");
@@ -624,7 +624,7 @@ void DrasculaEngine::animation_2_1() {
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
 		anima("bes.bin", 16);
-		playmusic(11);
+		playMusic(11);
 		anima("rap.bin", 16);
 		if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
 			break;
@@ -708,7 +708,7 @@ void DrasculaEngine::animation_4_1() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
 	pause(3);
-	stopmusic();
+	stopMusic();
 	flags[11] = 1;
 
 	talk_pianista(_textp[_lang][1], "p1.als");
@@ -823,7 +823,7 @@ void DrasculaEngine::animation_3_2() {
 }
 
 void DrasculaEngine::animation_4_2() {
-	stopmusic();
+	stopMusic();
 	flags[9] = 1;
 
 	pause(12);
@@ -879,7 +879,7 @@ void DrasculaEngine::animation_4_2() {
 
 	clearRoom();
 
-	playmusic(musica_room);
+	playMusic(musica_room);
 	loadPic("9.alg");
 	decompressPic(dir_dibujo1, MEDIA);
 	loadPic("aux9.alg");
@@ -978,7 +978,7 @@ void DrasculaEngine::animation_16_2() {
 
 	clearRoom();
 
-	playmusic(32);
+	playMusic(32);
 	int key = getscan();
 	if (key != 0)
 		goto asco;
@@ -1082,9 +1082,9 @@ asco:
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	FundeDelNegro(0);
 	if (musica_room != 0)
-		playmusic(musica_room);
+		playMusic(musica_room);
 	else
-		stopmusic();
+		stopMusic();
 }
 
 void DrasculaEngine::animation_17_2() {
@@ -1456,9 +1456,9 @@ void DrasculaEngine::animation_1_3() {
 
 void DrasculaEngine::animation_2_3() {
 	flags[0] = 1;
-	playmusic(13);
+	playMusic(13);
 	animation_3_3();
-	playmusic(13);
+	playMusic(13);
 	animation_4_3();
 	flags[1] = 1;
 	updateRoom();
@@ -2017,7 +2017,7 @@ void DrasculaEngine::animation_12_5() {
 	int color, componente;
 	char fundido;
 
-	playmusic(26);
+	playMusic(26);
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	pause(27);
@@ -2140,7 +2140,7 @@ void DrasculaEngine::animation_13_5() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 	pause(15);
 
-	playmusic(18);
+	playMusic(18);
 
 	for (;;) {
 		updateRoom();
@@ -2353,7 +2353,7 @@ void DrasculaEngine::animation_9_6() {
 	int v_cd;
 
 	anima("fin.bin", 14);
-	playmusic(13);
+	playMusic(13);
 	flags[5] = 1;
 	anima("drf.bin", 16);
 	FundeAlNegro(0);
@@ -2375,7 +2375,7 @@ void DrasculaEngine::animation_9_6() {
 	sentido_hare = 2;
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	playmusic(9);
+	playMusic(9);
 	clearRoom();
 	loadPic("nota.alg");
 	decompressPic(dir_dibujo1, COMPLETA);
@@ -2410,17 +2410,17 @@ void DrasculaEngine::animation_9_6() {
 	talk(_text[_lang][301], "301.als");
 	v_cd = _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) / 16;
 	v_cd = v_cd + 4;
-	playmusic(17);
+	playMusic(17);
 	FundeAlNegro(1);
 	clearRoom();
 	fliplay("qpc.bin", 1);
 	MusicFadeout();
-	stopmusic();
+	stopMusic();
 	clearRoom();
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, v_cd * 16);
-	playmusic(3);
+	playMusic(3);
 	fliplay("crd.bin", 1);
-	stopmusic();
+	stopMusic();
 }
 
 void DrasculaEngine::animation_10_6() {
@@ -2505,7 +2505,7 @@ void DrasculaEngine::animation_12_2() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
 	pause(3);
-	stopmusic();
+	stopMusic();
 	flags[11] = 1;
 
 	talk_pianista(_textp[_lang][5], "P5.als");
@@ -2539,7 +2539,7 @@ void DrasculaEngine::animation_26_2() {
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
 	pause(3);
-	stopmusic();
+	stopMusic();
 	flags[11] = 1;
 
 	talk_pianista(_textp[_lang][5], "P5.als");
@@ -3163,7 +3163,7 @@ void DrasculaEngine::animation_5_2() {
 }
 
 void DrasculaEngine::animation_6_2() {
-	stopmusic();
+	stopMusic();
 	flags[9] = 1;
 
 	clearRoom();
@@ -3198,7 +3198,7 @@ void DrasculaEngine::animation_6_2() {
 
 	clearRoom();
 
-	playmusic(musica_room);
+	playMusic(musica_room);
 	loadPic("9.alg");
 	decompressPic(dir_dibujo1, MEDIA);
 	loadPic("aux9.alg");
@@ -3215,7 +3215,7 @@ void DrasculaEngine::animation_6_2() {
 }
 
 void DrasculaEngine::animation_33_2() {
-	stopmusic();
+	stopMusic();
 	flags[9] = 1;
 
 	pause(12);
@@ -3254,7 +3254,7 @@ void DrasculaEngine::animation_33_2() {
 
 	clearRoom();
 
-	playmusic(musica_room);
+	playMusic(musica_room);
 	loadPic("9.alg");
 	decompressPic(dir_dibujo1, MEDIA);
 	loadPic("aux9.alg");
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index cba0e8ddb6..c19b67609b 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -236,10 +236,10 @@ int DrasculaEngine::go() {
 
 		paleta_hare();
 		if (!escoba()) {
-			salir_al_dos(0);
+			releaseGame();
 			break;
 		}
-		salir_al_dos(0);
+		releaseGame();
 		if (num_ejec == 6)
 			break;
 
@@ -249,13 +249,13 @@ int DrasculaEngine::go() {
 	return 0;
 }
 
-void DrasculaEngine::salir_al_dos(int r) {
+void DrasculaEngine::releaseGame() {
 	if (hay_sb == 1)
 		ctvd_end();
 	clearRoom();
 	Negro();
 	MusicFadeout();
-	stopmusic();
+	stopMusic();
 	freeMemory();
 	free(VGA);
 }
@@ -626,11 +626,11 @@ bucles:
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
 	if (num_ejec == 2) {
-		if (music_status() == 0 && musica_room != 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && musica_room != 0)
+			playMusic(musica_room);
 	} else {
-		if (music_status() == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0)
+			playMusic(musica_room);
 	}
 
 	MirarRaton();
@@ -1116,12 +1116,12 @@ martini:
 			musica_room = 0;
 
 		if (musica_antes != musica_room && musica_room != 0)
-			playmusic(musica_room);
+			playMusic(musica_room);
 		if (musica_room == 0)
-			stopmusic();
+			stopMusic();
 	} else {
 		if (musica_antes != musica_room && musica_room != 0)
-			playmusic(musica_room);
+			playMusic(musica_room);
 	}
 
 	if (num_ejec == 2) {
@@ -1384,7 +1384,7 @@ void DrasculaEngine::updateEvents() {
 			break;
 		case Common::EVENT_QUIT:
 			// TODO
-			salir_al_dos(0);
+			releaseGame();
 			exit(0);
 			break;
 		default:
@@ -1770,7 +1770,7 @@ bool DrasculaEngine::confirma_salir() {
 	}
 
 	if (key == Common::KEYCODE_ESCAPE) {
-		stopmusic();
+		stopMusic();
 		return false;
 	}
 
@@ -2159,16 +2159,16 @@ void DrasculaEngine::fin_sound() {
 	}
 }
 
-void DrasculaEngine::playmusic(int p) {
+void DrasculaEngine::playMusic(int p) {
 	AudioCD.stop();
 	AudioCD.play(p - 1, 1, 0, 0);
 }
 
-void DrasculaEngine::stopmusic() {
+void DrasculaEngine::stopMusic() {
 	AudioCD.stop();
 }
 
-int DrasculaEngine::music_status() {
+int DrasculaEngine::musicStatus() {
 	return AudioCD.isPlaying();
 }
 
@@ -3869,14 +3869,14 @@ bucle_opc:
 	updateRoom();
 
 	if (num_ejec == 1 || num_ejec == 4 || num_ejec == 6) {
-		if (music_status() == 0 && flags[11] == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0)
+			playMusic(musica_room);
 	} else if (num_ejec == 2) {
-		if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+			playMusic(musica_room);
 	} else if (num_ejec == 3 || num_ejec == 5) {
-		if (music_status() == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0)
+			playMusic(musica_room);
 	}
 
 	MirarRaton();
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 0281753cea..bb7f94ca78 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -355,7 +355,7 @@ public:
 
 	void allocMemory();
 	void freeMemory();
-	void salir_al_dos(int r);
+	void releaseGame();
 
 	void loadPic(const char *);
 	void decompressPic(byte *dir_escritura, int plt);
@@ -616,9 +616,9 @@ public:
 	void talk(const char *, const char *);
 	void talk_sinc(const char *, const char *, const char *);
 	void cierra_puerta(int nflag, int n_puerta);
-	void playmusic(int p);
-	void stopmusic();
-	int music_status();
+	void playMusic(int p);
+	void stopMusic();
+	int musicStatus();
 	void updateRoom();
 	bool carga_partida(const char *);
 	void puertas_cerradas(int);
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 3ba57652ce..4fb1d351d0 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -433,11 +433,11 @@ void DrasculaEngine::talk_tabernero(const char *dicho, const char *filename) {
 bucless:
 
 	if (num_ejec == 1) {
-		if (music_status() == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0)
+			playMusic(musica_room);
 	} else if (num_ejec == 2) {
-		if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+			playMusic(musica_room);
 	}
 
 	cara = _rnd->getRandomNumber(8);
@@ -701,8 +701,8 @@ bucless:
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
 
 	if (num_ejec == 1) {
-		if (music_status() == 0 && flags[11] == 0 && corta_musica == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0 && corta_musica == 0)
+			playMusic(musica_room);
 	}
 }
 
@@ -855,11 +855,11 @@ bucless:
 	}
 
 	if (num_ejec == 1) {
-		if (music_status() == 0 && flags[11] == 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0)
+			playMusic(musica_room);
 	} else if (num_ejec == 2) {
-		if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
-			playmusic(musica_room);
+		if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+			playMusic(musica_room);
 	}
 }
 
@@ -930,8 +930,8 @@ bucless:
 
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
-		playmusic(musica_room);
+	if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+		playMusic(musica_room);
 }
 
 void DrasculaEngine::talk_vbpuerta(const char *dicho, const char *filename) {
@@ -982,8 +982,8 @@ bucless:
 
 	updateRoom();
 	updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla);
-	if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
-		playmusic(musica_room);
+	if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+		playMusic(musica_room);
 }
 
 void DrasculaEngine::talk_ciego(const char *dicho, const char *filename, const char *sincronia) {
@@ -1726,10 +1726,10 @@ bucless:
 			goto bucless;
 	}
 
-	if (num_ejec == 1 && music_status() == 0 && flags[11] == 0)
-		playmusic(musica_room);
-	if (num_ejec == 2 && music_status() == 0 && flags[11] == 0 && musica_room != 0)
-		playmusic(musica_room);
+	if (num_ejec == 1 && musicStatus() == 0 && flags[11] == 0)
+		playMusic(musica_room);
+	if (num_ejec == 2 && musicStatus() == 0 && flags[11] == 0 && musica_room != 0)
+		playMusic(musica_room);
 }
 
 void DrasculaEngine::talk_baul(const char *dicho, const char *filename) {