diff options
author | Paweł Kołodziejski | 2008-05-11 12:47:26 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2008-05-11 12:47:26 +0000 |
commit | 583e2573ab6858d27161f2cef40df1e912d0adfa (patch) | |
tree | 5613f9436cc1305819f19c9281fbbfb0b1474076 /engines/drascula | |
parent | 35cc3a3d19f7a4c7c9f202f749a27eb1573cfad9 (diff) | |
download | scummvm-rg350-583e2573ab6858d27161f2cef40df1e912d0adfa.tar.gz scummvm-rg350-583e2573ab6858d27161f2cef40df1e912d0adfa.tar.bz2 scummvm-rg350-583e2573ab6858d27161f2cef40df1e912d0adfa.zip |
Negro -> Black
Destino -> dest
Origen -> src
Alto -> height
Ancho -> width
Buffer -> buffer
contador -> counter
dicho -> said
musica_antes -> previousMusic
musica_room -> roomMusic
cerca -> near
lejos -> far
paso -> step
espuerta -> isDoor
svn-id: r32017
Diffstat (limited to 'engines/drascula')
-rw-r--r-- | engines/drascula/animation.cpp | 38 | ||||
-rw-r--r-- | engines/drascula/drascula.cpp | 374 | ||||
-rw-r--r-- | engines/drascula/drascula.h | 54 | ||||
-rw-r--r-- | engines/drascula/talk.cpp | 194 |
4 files changed, 330 insertions, 330 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index ea949d4bd2..c8c9005265 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -56,7 +56,7 @@ void DrasculaEngine::animation_1_1() { clearRoom(); loadPic("cielo.alg"); decompressPic(dir_zona_pantalla, 256); - Negro(); + black(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); FundeDelNegro(2); if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE)) @@ -287,7 +287,7 @@ void DrasculaEngine::animation_1_1() { break; fin_sound_corte(); clearRoom(); - Negro(); + black(); playMusic(23); FundeDelNegro(0); if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE)) @@ -387,7 +387,7 @@ void DrasculaEngine::animation_1_1() { decompressPic(dir_hare_fondo, 1); } -void DrasculaEngine::talk_dr_grande(const char *dicho, const char *filename) { +void DrasculaEngine::talk_dr_grande(const char *said, const char *filename) { int tiempou; long tiempol; int x_talk[4] = {47, 93, 139, 185}; @@ -395,7 +395,7 @@ void DrasculaEngine::talk_dr_grande(const char *dicho, const char *filename) { int l = 0; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -425,7 +425,7 @@ bucless: l = 0; if (withVoices == 0) - centra_texto(dicho, 191, 69); + centra_texto(said, 191, 69); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -504,7 +504,7 @@ void DrasculaEngine::animation_2_1() { decompressPic(dir_zona_pantalla, MEDIA); if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE)) break; - Negro(); + black(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); FundeDelNegro(1); if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE)) @@ -879,7 +879,7 @@ void DrasculaEngine::animation_4_2() { clearRoom(); - playMusic(musica_room); + playMusic(roomMusic); loadPic("9.alg"); decompressPic(dir_dibujo1, MEDIA); loadPic("aux9.alg"); @@ -994,7 +994,7 @@ void DrasculaEngine::animation_16_2() { decompressPic(dir_dibujo1, MEDIA); if (_lang == kSpanish) - Negro(); + black(); copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); @@ -1118,12 +1118,12 @@ asco: decompressPic(dir_dibujo3, 1); loadPic(num_room); decompressPic(dir_dibujo1, MEDIA); - Negro(); + black(); updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); FundeDelNegro(0); - if (musica_room != 0) - playMusic(musica_room); + if (roomMusic != 0) + playMusic(roomMusic); else stopMusic(); } @@ -1833,7 +1833,7 @@ void DrasculaEngine::animation_4_4() { } void DrasculaEngine::animation_7_4() { - Negro(); + black(); talk(_text[_lang][427], "427.als"); FundeDelNegro(1); resta_objeto(8); @@ -2149,7 +2149,7 @@ void DrasculaEngine::animation_12_5() { lleva_al_hare(-14, 175); rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; hare_se_ve = 1; clearRoom(); sentido_hare = 1; @@ -2282,7 +2282,7 @@ void DrasculaEngine::animation_1_6() { updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); delay(930); clearRoom(); - Negro(); + black(); hare_se_ve = 0; flags[0] = 0; updateRoom(); @@ -2298,7 +2298,7 @@ void DrasculaEngine::animation_1_6() { updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); delay(900); clearRoom(); - Negro(); + black(); updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); FundeDelNegro(1); @@ -2405,7 +2405,7 @@ void DrasculaEngine::animation_9_6() { strcpy(num_room, "nada.alg"); loadPic("nota2.alg"); decompressPic(dir_dibujo1, MEDIA); - Negro(); + black(); sentido_hare = 1; hare_x -= 21; updateRoom(); @@ -2627,7 +2627,7 @@ void DrasculaEngine::animation_26_2() { flags[39] = 1; loadPic("974.alg"); decompressPic(dir_hare_dch, 1); - musica_room = 16; + roomMusic = 16; } void DrasculaEngine::animation_11_2() { @@ -3238,7 +3238,7 @@ void DrasculaEngine::animation_6_2() { clearRoom(); - playMusic(musica_room); + playMusic(roomMusic); loadPic("9.alg"); decompressPic(dir_dibujo1, MEDIA); loadPic("aux9.alg"); @@ -3294,7 +3294,7 @@ void DrasculaEngine::animation_33_2() { clearRoom(); - playMusic(musica_room); + playMusic(roomMusic); loadPic("9.alg"); decompressPic(dir_dibujo1, MEDIA); loadPic("aux9.alg"); diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index d16debbc21..cfb4e0940e 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -134,7 +134,7 @@ int DrasculaEngine::go() { comprueba_flags = 1; rompo = 0; rompo2 = 0; anda_a_objeto = 0; - paso_x = PASO_HARE_X; paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; step_y = PASO_HARE_Y; alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; alto_pies = PIES_HARE; alto_talk = ALTO_TALK_HARE; ancho_talk = ANCHO_TALK_HARE; hay_respuesta = 0; @@ -253,7 +253,7 @@ void DrasculaEngine::releaseGame() { if (hay_sb == 1) ctvd_end(); clearRoom(); - Negro(); + black(); MusicFadeout(); stopMusic(); freeMemory(); @@ -358,7 +358,7 @@ void DrasculaEngine::setRGB(byte *dir_lectura, int plt) { updatePalette(); } -void DrasculaEngine::Negro() { +void DrasculaEngine::black() { int color, componente; DacPalette256 palNegra; @@ -391,74 +391,74 @@ void DrasculaEngine::setvgapalette256(byte *PalBuf) { _system->updateScreen(); } -void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int Ancho, - int Alto, byte *Origen, byte *Destino) { +void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width, + int height, byte *src, byte *dest) { int x; - Destino += xdes + ydes * 320; - Origen += xorg + yorg * 320; - for (x = 0; x < Alto; x++) { - memcpy(Destino, Origen, Ancho); - Destino += 320; - Origen += 320; + dest += xdes + ydes * 320; + src += xorg + yorg * 320; + for (x = 0; x < height; x++) { + memcpy(dest, src, width); + dest += 320; + src += 320; } } -void DrasculaEngine::copyRect(int xorg, int yorg, int xdes, int ydes, int Ancho, - int Alto, byte *Origen, byte *Destino) { +void DrasculaEngine::copyRect(int xorg, int yorg, int xdes, int ydes, int width, + int height, byte *src, byte *dest) { int y, x; - Destino += xdes + ydes * 320; - Origen += xorg + yorg * 320; + dest += xdes + ydes * 320; + src += xorg + yorg * 320; - for (y = 0; y < Alto; y++) - for (x = 0; x < Ancho; x++) - if (Origen[x + y * 320] != 255) - Destino[x + y * 320] = Origen[x + y * 320]; + for (y = 0; y < height; y++) + for (x = 0; x < width; x++) + if (src[x + y * 320] != 255) + dest[x + y * 320] = src[x + y * 320]; } -void DrasculaEngine::copyRectClip(int *Array, byte *Origen, byte *Destino) { +void DrasculaEngine::copyRectClip(int *Array, byte *src, byte *dest) { int y, x; int xorg = Array[0]; int yorg = Array[1]; int xdes = Array[2]; int ydes = Array[3]; - int Ancho = Array[4]; - int Alto = Array[5]; + int width = Array[4]; + int height = Array[5]; if (ydes < 0) { yorg += -ydes; - Alto += ydes; + height += ydes; ydes = 0; } if (xdes < 0) { xorg += -xdes; - Ancho += xdes; + width += xdes; xdes = 0; } - if ((xdes + Ancho) > 319) - Ancho -= (xdes + Ancho) - 320; - if ((ydes + Alto) > 199) - Alto -= (ydes + Alto) - 200; + if ((xdes + width) > 319) + width -= (xdes + width) - 320; + if ((ydes + height) > 199) + height -= (ydes + height) - 200; - Destino += xdes + ydes * 320; - Origen += xorg + yorg * 320; + dest += xdes + ydes * 320; + src += xorg + yorg * 320; - for (y = 0; y < Alto; y++) - for (x = 0; x < Ancho; x++) - if (Origen[x + y * 320] != 255) - Destino[x + y * 320] = Origen[x + y * 320]; + for (y = 0; y < height; y++) + for (x = 0; x < width; x++) + if (src[x + y * 320] != 255) + dest[x + y * 320] = src[x + y * 320]; } -void DrasculaEngine::updateScreen(int xorg, int yorg, int xdes, int ydes, int Ancho, int Alto, byte *Buffer) { +void DrasculaEngine::updateScreen(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *buffer) { int x; byte *ptr = VGA; ptr += xdes + ydes * 320; - Buffer += xorg + yorg * 320; - for (x = 0; x < Alto; x++) { - memcpy(ptr, Buffer, Ancho); + buffer += xorg + yorg * 320; + for (x = 0; x < height; x++) { + memcpy(ptr, buffer, width); ptr += 320; - Buffer += 320; + buffer += 320; } _system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200); @@ -470,7 +470,7 @@ bool DrasculaEngine::escoba() { dir_texto = dir_mesa; - musica_antes = -1; + previousMusic = -1; if (num_ejec != 2) { int soc = 0; @@ -600,8 +600,8 @@ bool DrasculaEngine::escoba() { bucles: if (hare_se_mueve == 0) { - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; } if (hare_se_mueve == 0 && anda_a_objeto == 1) { sentido_hare = sentido_final; @@ -621,11 +621,11 @@ bucles: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); if (num_ejec == 2) { - if (musicStatus() == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && roomMusic != 0) + playMusic(roomMusic); } else { if (musicStatus() == 0) - playMusic(musica_room); + playMusic(roomMusic); } MirarRaton(); @@ -826,7 +826,7 @@ void DrasculaEngine::withoutVerb() { } bool DrasculaEngine::para_cargar(char nom_game[]) { - musica_antes = musica_room; + previousMusic = roomMusic; menu_scr = 0; if (num_ejec != 1) clearRoom(); @@ -890,7 +890,7 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) { strcat(num_room, ".alg"); getLine(ald, buffer, size); - sscanf(buffer, "%d", &musica_room); + sscanf(buffer, "%d", &roomMusic); getLine(ald, buffer, size); sscanf(buffer, "%s", roomDisk); getLine(ald, buffer, size); @@ -907,9 +907,9 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) { getLine(ald, buffer, size); sscanf(buffer, "%d",&alto_pies); getLine(ald, buffer, size); - sscanf(buffer, "%d",&paso_x); + sscanf(buffer, "%d",&step_x); getLine(ald, buffer, size); - sscanf(buffer, "%d",&paso_y); + sscanf(buffer, "%d",&step_y); getLine(ald, buffer, size); sscanf(buffer, "%s",pant1); @@ -957,8 +957,8 @@ martini: getLine(ald, buffer, size); sscanf(buffer, "%d", &visible[l]); getLine(ald, buffer, size); - sscanf(buffer, "%d", &espuerta[l]); - if (espuerta[l] != 0) { + sscanf(buffer, "%d", &isDoor[l]); + if (isDoor[l] != 0) { getLine(ald, buffer, size); sscanf(buffer, "%s", alapantallakeva[l]); getLine(ald, buffer, size); @@ -984,17 +984,17 @@ martini: if (num_ejec != 2) { getLine(ald, buffer, size); - sscanf(buffer, "%d", &lejos); + sscanf(buffer, "%d", &far); getLine(ald, buffer, size); - sscanf(buffer, "%d", &cerca); + sscanf(buffer, "%d", &near); } delete ald; ald = NULL; if (num_ejec == 2) { if (martin == 0) { - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; alto_pies = PIES_HARE; @@ -1045,27 +1045,27 @@ martini: if (num_ejec != 2) { for (l = 0; l <= suelo_y1; l++) - factor_red[l] = lejos; + factor_red[l] = far; for (l = suelo_y1; l <= 201; l++) - factor_red[l] = cerca; + factor_red[l] = near; - chiquez = (float)(cerca - lejos) / (float)(suelo_y2 - suelo_y1); + chiquez = (float)(near - far) / (float)(suelo_y2 - suelo_y1); for (l = suelo_y1; l <= suelo_y2; l++) { - factor_red[l] = (int)(lejos + pequegnez); + factor_red[l] = (int)(far + pequegnez); pequegnez = pequegnez + chiquez; } } if (!strcmp(num_room, "24.alg")) { for (l = suelo_y1 - 1; l > 74; l--) { - factor_red[l] = (int)(lejos - pequegnez); + factor_red[l] = (int)(far - pequegnez); pequegnez = pequegnez + chiquez; } } if (num_ejec == 5 && !strcmp(num_room, "54.alg")) { for (l = suelo_y1 - 1; l > 84; l--) { - factor_red[l] = (int)(lejos - pequegnez); + factor_red[l] = (int)(far - pequegnez); pequegnez = pequegnez + chiquez; } } @@ -1098,25 +1098,25 @@ martini: updateData(); if (num_ejec == 1) - espuerta[7] = 0; + isDoor[7] = 0; if (num_ejec == 2) { if (!strcmp(num_room, "14.alg") && flags[39] == 1) - musica_room = 16; + roomMusic = 16; else if (!strcmp(num_room, "15.alg") && flags[39] == 1) - musica_room = 16; + roomMusic = 16; if (!strcmp(num_room, "14.alg") && flags[5] == 1) - musica_room = 0; + roomMusic = 0; else if (!strcmp(num_room, "15.alg") && flags[5] == 1) - musica_room = 0; + roomMusic = 0; - if (musica_antes != musica_room && musica_room != 0) - playMusic(musica_room); - if (musica_room == 0) + if (previousMusic != roomMusic && roomMusic != 0) + playMusic(roomMusic); + if (roomMusic == 0) stopMusic(); } else { - if (musica_antes != musica_room && musica_room != 0) - playMusic(musica_room); + if (previousMusic != roomMusic && roomMusic != 0) + playMusic(roomMusic); } if (num_ejec == 2) { @@ -1211,7 +1211,7 @@ void DrasculaEngine::comprueba_objetos() { for (l = 0; l < objs_room; l++) { if (x_raton > x1[l] && y_raton > y1[l] && x_raton < x2[l] && y_raton < y2[l] - && visible[l] == 1 && espuerta[l] == 0) { + && visible[l] == 1 && isDoor[l] == 0) { strcpy(texto_nombre, objName[l]); hay_nombre = 1; veo = 1; @@ -1600,14 +1600,14 @@ bool DrasculaEngine::saves() { return true; } -void DrasculaEngine::print_abc(const char *dicho, int x_pantalla, int y_pantalla) { +void DrasculaEngine::print_abc(const char *said, int x_pantalla, int y_pantalla) { int pos_texto[8]; int y_de_letra = 0, x_de_letra = 0, h, longitud; - longitud = strlen(dicho); + longitud = strlen(said); for (h = 0; h < longitud; h++) { y_de_letra = Y_ABC; - int c = toupper(dicho[h]); + int c = toupper(said[h]); if (c == 'A') x_de_letra = X_A; else if (c == 'B') @@ -2107,13 +2107,13 @@ void DrasculaEngine::pon_bj() { copyRectClip(pos_bj, dir_dibujo3, dir_zona_pantalla); } -void DrasculaEngine::hipo(int contador) { +void DrasculaEngine::hipo(int counter) { int y = 0, sentido = 0; if (num_ejec == 3) y = -1; comienza: - contador--; + counter--; updateRoom(); if (num_ejec == 3) @@ -2137,7 +2137,7 @@ comienza: if (y == 0) sentido = 0; } - if (contador > 0) + if (counter > 0) goto comienza; updateRoom(); @@ -2221,86 +2221,86 @@ void DrasculaEngine::puertas_cerradas(int l) { return; else if (num_ejec == 2) { if (num_obj[l] == 138 && flags[0] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 138 && flags[0] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 136 && flags[8] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 136 && flags[8] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 156 && flags[16] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 156 && flags[16] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 163 && flags[17] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 163 && flags[17] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 177 && flags[15] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 177 && flags[15] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 175 && flags[40] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 175 && flags[40] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 173 && flags[36] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 173 && flags[36] == 1) - espuerta[l] = 1; + isDoor[l] = 1; } else if (num_ejec == 4) { if (num_obj[l] == 101 && flags[0] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 101 && flags[0] == 1 && flags[28] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 103 && flags[0] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 103 && flags[0] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 104 && flags[1] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 104 && flags[1] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 105 && flags[1] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 105 && flags[1] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 106 && flags[2] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 106 && flags[2] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 107 && flags[2] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 107 && flags[2] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 110 && flags[6] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 110 && flags[6] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 114 && flags[4] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 114 && flags[4] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 115 && flags[4] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 115 && flags[4] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 116 && flags[5] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 116 && flags[5] == 1 && flags[23] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 117 && flags[5] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 117 && flags[5] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 120 && flags[8] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 120 && flags[8] == 1) - espuerta[l] = 1; + isDoor[l] = 1; else if (num_obj[l] == 122 && flags[7] == 0) - espuerta[l] = 0; + isDoor[l] = 0; else if (num_obj[l] == 122 && flags[7] == 1) - espuerta[l] = 1; + isDoor[l] = 1; } } @@ -2361,8 +2361,8 @@ void DrasculaEngine::hare_claro() { void DrasculaEngine::empieza_andar() { hare_se_mueve = 1; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; if (num_ejec == 2) { if ((sitio_x < hare_x) && (sitio_y <= (hare_y + alto_hare))) @@ -2396,48 +2396,48 @@ void DrasculaEngine::pon_hare() { int pos_hare[6]; int r; - if (hare_se_mueve == 1 && paso_x == PASO_HARE_X) { - for (r = 0; r < paso_x; r++) { + if (hare_se_mueve == 1 && step_x == PASO_HARE_X) { + for (r = 0; r < step_x; r++) { if (num_ejec != 2) { if (sentido_hare == 0 && sitio_x - r == hare_x + ancho_hare / 2) { hare_se_mueve = 0; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; } if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare / 2) { hare_se_mueve = 0; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = 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; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; } if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare) { hare_se_mueve = 0; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; hare_x = sitio_x - ancho_hare + 4; hare_y = sitio_y - alto_hare; } } } } - if (hare_se_mueve == 1 && paso_y == PASO_HARE_Y) { - for (r = 0; r < paso_y; r++) { + if (hare_se_mueve == 1 && step_y == PASO_HARE_Y) { + for (r = 0; r < step_y; r++) { if (sentido_hare == 2 && sitio_y - r == hare_y + alto_hare) { hare_se_mueve = 0; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; } if (sentido_hare == 3 && sitio_y + r == hare_y + alto_hare) { hare_se_mueve = 0; - paso_x = PASO_HARE_X; - paso_y = PASO_HARE_Y; + step_x = PASO_HARE_X; + step_y = PASO_HARE_Y; } } } @@ -2596,7 +2596,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { talk(_text[_lang][442], "442.als"); else { puertas_cerradas(l); - if (espuerta[l] != 0) { + if (isDoor[l] != 0) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); sentido_hare = sentidobj[l]; updateRoom(); @@ -2605,7 +2605,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; if (num_obj[l] == 105) { animation_2_1(); @@ -2620,13 +2620,13 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { } } else if (num_ejec == 2) { puertas_cerradas(l); - if (espuerta[l] != 0) { + if (isDoor[l] != 0) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); hare_se_mueve = 0; sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; if (num_obj[l] == 136) animation_2_2(); if (num_obj[l] == 124) @@ -2653,7 +2653,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { } } else if (num_ejec == 3) { puertas_cerradas(l); - if (espuerta[l] != 0 && visible[l] == 1) { + if (isDoor[l] != 0 && visible[l] == 1) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); sentido_hare = sentidobj[l]; updateRoom(); @@ -2662,7 +2662,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; clearRoom(); strcpy(salgo, alapantallakeva[l]); strcat(salgo, ".ald"); @@ -2671,7 +2671,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { } } else if (num_ejec == 4) { puertas_cerradas(l); - if (espuerta[l] != 0) { + if (isDoor[l] != 0) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); sentido_hare = sentidobj[l]; updateRoom(); @@ -2680,7 +2680,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; if (num_obj[l] == 108) lleva_al_hare(171, 78); @@ -2692,7 +2692,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { } } else if (num_ejec == 5) { puertas_cerradas(l); - if (espuerta[l] != 0 && visible[l] == 1) { + if (isDoor[l] != 0 && visible[l] == 1) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); sentido_hare = sentidobj[l]; updateRoom(); @@ -2701,7 +2701,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; hare_se_ve = 1; clearRoom(); strcpy(salgo, alapantallakeva[l]); @@ -2711,7 +2711,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { } } else if (num_ejec == 6) { puertas_cerradas(l); - if (espuerta[l] != 0) { + if (isDoor[l] != 0) { lleva_al_hare(sitiobj_x[l], sitiobj_y[l]); sentido_hare = sentidobj[l]; updateRoom(); @@ -2720,7 +2720,7 @@ bool DrasculaEngine::sal_de_la_habitacion(int l) { sentido_hare = sentido_alkeva[l]; obj_saliendo = alapuertakeva[l]; rompo = 1; - musica_antes = musica_room; + previousMusic = roomMusic; clearRoom(); strcpy(salgo, alapantallakeva[l]); strcat(salgo, ".ald"); @@ -3579,11 +3579,11 @@ void DrasculaEngine::cuadrante_1() { if (distancia_x < distancia_y) { direccion_hare = 0; sentido_hare = 2; - paso_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); + step_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); } else { direccion_hare = 7; sentido_hare = 0; - paso_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); + step_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); } } @@ -3600,11 +3600,11 @@ void DrasculaEngine::cuadrante_2() { if (distancia_x < distancia_y) { direccion_hare = 1; sentido_hare = 2; - paso_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); + step_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); } else { direccion_hare = 2; sentido_hare = 1; - paso_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); + step_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); } } @@ -3621,11 +3621,11 @@ void DrasculaEngine::cuadrante_3() { if (distancia_x < distancia_y) { direccion_hare = 5; sentido_hare = 3; - paso_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); + step_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); } else { direccion_hare = 6; sentido_hare = 0; - paso_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); + step_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); } } @@ -3642,11 +3642,11 @@ void DrasculaEngine::cuadrante_4() { if (distancia_x < distancia_y) { direccion_hare = 4; sentido_hare = 3; - paso_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); + step_x = (int)(distancia_x / (distancia_y / PASO_HARE_Y)); } else { direccion_hare = 3; sentido_hare = 1; - paso_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); + step_y = (int)(distancia_y / (distancia_x / PASO_HARE_X)); } } @@ -3691,29 +3691,29 @@ void DrasculaEngine::aumenta_num_frame() { num_frame = 0; if (direccion_hare == 0) { - hare_x = hare_x - paso_x; - hare_y = hare_y - paso_y; + hare_x = hare_x - step_x; + hare_y = hare_y - step_y; } else if (direccion_hare == 7) { - hare_x = hare_x - paso_x; - hare_y = hare_y - paso_y; + hare_x = hare_x - step_x; + hare_y = hare_y - step_y; } else if (direccion_hare == 1) { - hare_x = hare_x + paso_x; - hare_y = hare_y - paso_y; + hare_x = hare_x + step_x; + hare_y = hare_y - step_y; } else if (direccion_hare == 2) { - hare_x = hare_x + paso_x; - hare_y = hare_y - paso_y; + hare_x = hare_x + step_x; + hare_y = hare_y - step_y; } else if (direccion_hare == 3) { - hare_x = hare_x + paso_x; - hare_y = hare_y + paso_y; + hare_x = hare_x + step_x; + hare_y = hare_y + step_y; } else if (direccion_hare == 4) { - hare_x = hare_x + paso_x; - hare_y = hare_y + paso_y; + hare_x = hare_x + step_x; + hare_y = hare_y + step_y; } else if (direccion_hare == 5) { - hare_x = hare_x - paso_x; - hare_y = hare_y + paso_y; + hare_x = hare_x - step_x; + hare_y = hare_y + step_y; } else if (direccion_hare == 6) { - hare_x = hare_x - paso_x; - hare_y = hare_y + paso_y; + hare_x = hare_x - step_x; + hare_y = hare_y + step_y; } } @@ -3865,13 +3865,13 @@ bucle_opc: if (num_ejec == 1 || num_ejec == 4 || num_ejec == 6) { if (musicStatus() == 0 && flags[11] == 0) - playMusic(musica_room); + playMusic(roomMusic); } else if (num_ejec == 2) { - if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } else if (num_ejec == 3 || num_ejec == 5) { if (musicStatus() == 0) - playMusic(musica_room); + playMusic(roomMusic); } MirarRaton(); @@ -3972,10 +3972,10 @@ bucle_opc: withoutVerb(); } -void DrasculaEngine::print_abc_opc(const char *dicho, int x_pantalla, int y_pantalla, int juego) { +void DrasculaEngine::print_abc_opc(const char *said, int x_pantalla, int y_pantalla, int juego) { int pos_texto[6]; int y_de_signos, y_de_letra, x_de_letra = 0, h, longitud; - longitud = strlen(dicho); + longitud = strlen(said); for (h = 0; h < longitud; h++) { if (juego == 1) { @@ -3989,7 +3989,7 @@ void DrasculaEngine::print_abc_opc(const char *dicho, int x_pantalla, int y_pant y_de_signos = Y_SIGNOS_OPC_2; } - int c = toupper(dicho[h]); + int c = toupper(said[h]); if (c == 'A') x_de_letra = X_A_OPC; else if (c == 'B') @@ -4341,11 +4341,11 @@ void DrasculaEngine::updateData() { visible[1] = 0; } else if (num_ejec == 6) { if ((!strcmp(num_room, "58.alg")) && flags[8] == 0) - espuerta[1] = 0; + isDoor[1] = 0; if ((!strcmp(num_room, "58.alg")) && flags[8] == 1) - espuerta[1] = 1; + isDoor[1] = 1; if (!strcmp(num_room, "59.alg")) - espuerta[1] = 0; + isDoor[1] = 0; if (!strcmp(num_room, "60.alg")) { sentido_dr = 0; x_dr = 155; @@ -4357,13 +4357,13 @@ void DrasculaEngine::updateData() { void DrasculaEngine::anda_pabajo() { direccion_hare = 4; sentido_hare = 3; - paso_x = 0; + step_x = 0; } void DrasculaEngine::anda_parriba() { direccion_hare = 0; sentido_hare = 2; - paso_x = 0; + step_x = 0; } void DrasculaEngine::pon_vb() { @@ -4428,13 +4428,13 @@ void DrasculaEngine::lleva_vb(int punto_x) { vb_se_mueve = 0; } -void DrasculaEngine::hipo_sin_nadie(int contador){ +void DrasculaEngine::hipo_sin_nadie(int counter){ int y = 0, sentido = 0; if (num_ejec == 3) y = -1; comienza: - contador--; + counter--; copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); if (num_ejec == 3) @@ -4458,7 +4458,7 @@ comienza: if (y == 0) sentido = 0; } - if (contador > 0) + if (counter > 0) goto comienza; copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index a61d7df9ab..55be93203a 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -376,12 +376,12 @@ public: void paleta_hare(); void updatePalette(); void setvgapalette256(byte *PalBuf); - void copyBackground(int xorg, int yorg, int xdes, int ydes, int Ancho, - int Alto, byte *Origen, byte *Destino); - void copyRect(int xorg, int yorg, int xdes, int ydes, int Ancho, - int Alto, byte *Origen, byte *Destino); - void copyRectClip(int *Array, byte *Origen, byte *Destino); - void updateScreen(int xorg, int yorg, int xdes, int ydes, int Ancho, int Alto, byte *Buffer); + void copyBackground(int xorg, int yorg, int xdes, int ydes, int width, + int height, byte *src, byte *dest); + void copyRect(int xorg, int yorg, int xdes, int ydes, int width, + int height, byte *src, byte *dest); + void copyRectClip(int *Array, byte *src, byte *dest); + void updateScreen(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *buffer); DacPalette256 palJuego; DacPalette256 palHare; @@ -408,7 +408,7 @@ public: Common::File *ald, *sku; int hay_sb; - int nivel_osc, musica_antes, musica_room; + int nivel_osc, previousMusic, roomMusic; char num_room[20], roomDisk[20]; char currentData[20]; int objs_room; @@ -417,7 +417,7 @@ public: char objName[30][20]; char iconName[44][13]; - int num_obj[40], visible[40], espuerta[40]; + int num_obj[40], visible[40], isDoor[40]; int sitiobj_x[40], sitiobj_y[40], sentidobj[40]; int objetos_que_tengo[43]; char alapantallakeva[40][20]; @@ -439,11 +439,11 @@ public: 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 rompo, rompo2; - int paso_x, paso_y; + int step_x, step_y; int alto_hare, ancho_hare, alto_pies; int alto_talk, ancho_talk; int suelo_x1, suelo_y1, suelo_x2, suelo_y2; - int cerca, lejos; + int near, far; int sentido_final, anda_a_objeto; int obj_saliendo; int diff_vez, conta_vez; @@ -479,9 +479,9 @@ public: int boton_dch; bool escoba(); - void Negro(); + void black(); void talk_vb(const char *, const char *); - void talk_vbpuerta(const char *dicho, const char *filename); + void talk_vbpuerta(const char *said, const char *filename); void talk_ciego(const char *, const char *, const char *); void talk_hacker(const char *, const char *); void pickObject(int); @@ -489,7 +489,7 @@ public: void anda_pabajo(); void pon_vb(); void lleva_vb(int punto_x); - void hipo_sin_nadie(int contador); + void hipo_sin_nadie(int counter); void openDoor(int nflag, int n_puerta); void mapa(); void animation_1_1(); @@ -606,22 +606,22 @@ public: void fin_sound_corte(); void FundeAlNegro(int VelocidadDeFundido); void pause(int); - void talk_dr_grande(const char *dicho, const char *filename); + void talk_dr_grande(const char *said, const char *filename); void pon_igor(); void pon_bj(); void pon_dr(); - void talk_igor_dch(const char *dicho, const char *filename); - void talk_dr_dch(const char *dicho, const char *filename); - void talk_dr_izq(const char *dicho, const char *filename); + void talk_igor_dch(const char *said, const char *filename); + void talk_dr_dch(const char *said, const char *filename); + void talk_dr_izq(const char *said, const char *filename); void talk_solo(const char *, const char *); void talk_igor_frente(const char *, const char *); - void talk_tabernero(const char *dicho, const char *filename); - void talk_igorpuerta(const char *dicho, const char *filename); - void talk_igor_peluca(const char *dicho, const char *filename); + 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 fin_sound(); void talk_bj(const char *, const char *); - void talk_baul(const char *dicho, const char *filename); + void talk_baul(const char *said, const char *filename); void talk(const char *, const char *); void talk_sinc(const char *, const char *, const char *); void cierra_puerta(int nflag, int n_puerta); @@ -732,8 +732,8 @@ public: void conversa(const char *); void print_abc_opc(const char *, int, int, int); void responde(int); - void talk_borracho(const char *dicho, const char *filename); - void talk_pianista(const char *dicho, const char *filename); + void talk_borracho(const char *said, const char *filename); + void talk_pianista(const char *said, const char *filename); void MusicFadeout(); void ctvd_end(); @@ -791,8 +791,8 @@ public: void update_50(); void update_57(); void talk_igor_sentado(const char *, const char *); - void talk_lobo(const char *dicho, const char *filename); - void talk_mus(const char *dicho, const char *filename); + void talk_lobo(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); @@ -825,8 +825,8 @@ public: void talk_pen(const char *, const char *); void talk_pen2(const char *, const char *); void talk_taber2(const char *, const char *); - void talk_bj_cama(const char *dicho, const char * filename); - void talk_htel(const char *dicho, const char *filename); + void talk_bj_cama(const char *said, const char * filename); + void talk_htel(const char *said, const char *filename); private: int _lang; diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index c128c073f5..62f44c31d3 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -27,7 +27,7 @@ namespace Drascula { -void DrasculaEngine::talk_igor_dch(const char *dicho, const char *filename) { +void DrasculaEngine::talk_igor_dch(const char *said, const char *filename) { int tiempou; long tiempol; @@ -35,7 +35,7 @@ void DrasculaEngine::talk_igor_dch(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -71,7 +71,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, x_igor + 26, y_igor); + centra_texto(said, x_igor + 26, y_igor); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -99,7 +99,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_dr_izq(const char *dicho, const char *filename) { +void DrasculaEngine::talk_dr_izq(const char *said, const char *filename) { int tiempou; long tiempol; @@ -107,7 +107,7 @@ void DrasculaEngine::talk_dr_izq(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -148,7 +148,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, x_dr + 19, y_dr); + centra_texto(said, x_dr + 19, y_dr); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -177,7 +177,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_dr_dch(const char *dicho, const char *filename) { +void DrasculaEngine::talk_dr_dch(const char *said, const char *filename) { int tiempou; long tiempol; @@ -185,7 +185,7 @@ void DrasculaEngine::talk_dr_dch(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -225,7 +225,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, x_dr + 19, y_dr); + centra_texto(said, x_dr + 19, y_dr); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -258,12 +258,12 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_solo(const char *dicho, const char *filename) { +void DrasculaEngine::talk_solo(const char *said, const char *filename) { int tiempou; long tiempol; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -292,11 +292,11 @@ bucless: if (withVoices == 0) { if (num_ejec == 1) - centra_texto(dicho, 156, 90); + centra_texto(said, 156, 90); else if (num_ejec == 6) - centra_texto(dicho, 213, 72); + centra_texto(said, 213, 72); else if (num_ejec == 5) - centra_texto(dicho, 173, 92); + centra_texto(said, 173, 92); } updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -322,7 +322,7 @@ bucless: } } -void DrasculaEngine::talk_igor_frente(const char *dicho, const char *filename) { +void DrasculaEngine::talk_igor_frente(const char *said, const char *filename) { int tiempou; long tiempol; @@ -330,7 +330,7 @@ void DrasculaEngine::talk_igor_frente(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -368,7 +368,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, x_igor + 26, y_igor); + centra_texto(said, x_igor + 26, y_igor); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -403,7 +403,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_tabernero(const char *dicho, const char *filename) { +void DrasculaEngine::talk_tabernero(const char *said, const char *filename) { int tiempou; long tiempol; @@ -411,7 +411,7 @@ void DrasculaEngine::talk_tabernero(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -434,10 +434,10 @@ bucless: if (num_ejec == 1) { if (musicStatus() == 0) - playMusic(musica_room); + playMusic(roomMusic); } else if (num_ejec == 2) { - if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } cara = _rnd->getRandomNumber(8); @@ -451,7 +451,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 132, 45); + centra_texto(said, 132, 45); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -475,7 +475,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_bj(const char *dicho, const char *filename) { +void DrasculaEngine::talk_bj(const char *said, const char *filename) { int tiempou; long tiempol; @@ -483,7 +483,7 @@ void DrasculaEngine::talk_bj(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -519,7 +519,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, x_bj + 7, y_bj); + centra_texto(said, x_bj + 7, y_bj); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -528,7 +528,7 @@ bucless: updateRoom(); if (withVoices == 0) - centra_texto(dicho, 93, 80); + centra_texto(said, 93, 80); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } @@ -554,7 +554,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk(const char *dicho, const char *filename) { +void DrasculaEngine::talk(const char *said, const char *filename) { int tiempou; long tiempol; @@ -568,15 +568,15 @@ void DrasculaEngine::talk(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); if (num_ejec == 6) { if (flags[0] == 0 && (!strcmp(num_room, "102.alg"))) { - talk_pen(dicho, filename); + talk_pen(said, filename); return; } if (flags[0] == 0 && (!strcmp(num_room, "58.alg"))) { - talk_pen2(dicho, filename); + talk_pen2(said, filename); return; } } @@ -674,7 +674,7 @@ bucless: } if (withVoices == 0) - centra_texto(dicho, hare_x, hare_y); + centra_texto(said, hare_x, hare_y); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -702,17 +702,17 @@ bucless: if (num_ejec == 1) { if (musicStatus() == 0 && flags[11] == 0 && corta_musica == 0) - playMusic(musica_room); + playMusic(roomMusic); } } -void DrasculaEngine::talk_pianista(const char *dicho, const char *filename) { +void DrasculaEngine::talk_pianista(const char *said, const char *filename) { int tiempou; long tiempol; int x_talk[4] = { 97, 145, 193, 241 }; int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -745,7 +745,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 221, 128); + centra_texto(said, 221, 128); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -770,14 +770,14 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_borracho(const char *dicho, const char *filename) { +void DrasculaEngine::talk_borracho(const char *said, const char *filename) { int tiempou; long tiempol; int x_talk[8] = { 1, 21, 41, 61, 81, 101, 121, 141 }; int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -824,7 +824,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 181, 54); + centra_texto(said, 181, 54); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -856,14 +856,14 @@ bucless: if (num_ejec == 1) { if (musicStatus() == 0 && flags[11] == 0) - playMusic(musica_room); + playMusic(roomMusic); } else if (num_ejec == 2) { - if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } } -void DrasculaEngine::talk_vb(const char *dicho, const char *filename) { +void DrasculaEngine::talk_vb(const char *said, const char *filename) { int tiempou; long tiempol; @@ -871,7 +871,7 @@ void DrasculaEngine::talk_vb(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -907,7 +907,7 @@ bucless: } if (withVoices == 0) - centra_texto(dicho, vb_x, 66); + centra_texto(said, vb_x, 66); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -930,16 +930,16 @@ bucless: updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); - if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } -void DrasculaEngine::talk_vbpuerta(const char *dicho, const char *filename) { +void DrasculaEngine::talk_vbpuerta(const char *said, const char *filename) { int tiempou; long tiempol; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -962,7 +962,7 @@ bucless: updateRoom(); if (withVoices == 0) - centra_texto(dicho, 150, 80); + centra_texto(said, 150, 80); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); int key = getscan(); @@ -982,18 +982,18 @@ bucless: updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); - if (musicStatus() == 0 && flags[11] == 0 && musica_room != 0) - playMusic(musica_room); + if (musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } -void DrasculaEngine::talk_ciego(const char *dicho, const char *filename, const char *sincronia) { +void DrasculaEngine::talk_ciego(const char *said, const char *filename, const char *sincronia) { byte *num_cara; int p = 0; int pos_ciego[6]; int cara = 0; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); color_abc(VON_BRAUN); @@ -1063,7 +1063,7 @@ bucless: copyRectClip( pos_ciego, num_cara, dir_zona_pantalla); if (withVoices == 0) - centra_texto(dicho, 310, 71); + centra_texto(said, 310, 71); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); pause(2); @@ -1085,12 +1085,12 @@ bucless: } } -void DrasculaEngine::talk_hacker(const char *dicho, const char *filename) { +void DrasculaEngine::talk_hacker(const char *said, const char *filename) { int tiempou; long tiempol; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1114,7 +1114,7 @@ void DrasculaEngine::talk_hacker(const char *dicho, const char *filename) { bucless: if (withVoices == 0) - centra_texto(dicho, 156, 170); + centra_texto(said, 156, 170); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); int key = getscan(); @@ -1135,7 +1135,7 @@ bucless: key = 0; } -void DrasculaEngine::talk_lobo(const char *dicho, const char *filename) { +void DrasculaEngine::talk_lobo(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1143,7 +1143,7 @@ void DrasculaEngine::talk_lobo(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1175,7 +1175,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 203, 78); + centra_texto(said, 203, 78); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1200,7 +1200,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_mus(const char *dicho, const char *filename) { +void DrasculaEngine::talk_mus(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1208,7 +1208,7 @@ void DrasculaEngine::talk_mus(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1240,7 +1240,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 197, 64); + centra_texto(said, 197, 64); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1265,7 +1265,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_pen(const char *dicho, const char *filename) { +void DrasculaEngine::talk_pen(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1273,7 +1273,7 @@ void DrasculaEngine::talk_pen(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); flags[1] = 1; @@ -1311,7 +1311,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 160, 105); + centra_texto(said, 160, 105); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1338,7 +1338,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_pen2(const char *dicho, const char *filename) { +void DrasculaEngine::talk_pen2(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1346,7 +1346,7 @@ void DrasculaEngine::talk_pen2(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); flags[1] = 1; @@ -1380,7 +1380,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 195, 107); + centra_texto(said, 195, 107); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1407,7 +1407,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_taber2(const char *dicho, const char *filename) { +void DrasculaEngine::talk_taber2(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1415,7 +1415,7 @@ void DrasculaEngine::talk_taber2(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1447,7 +1447,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 132, 45); + centra_texto(said, 132, 45); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1472,7 +1472,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_bj_cama(const char *dicho, const char *filename) { +void DrasculaEngine::talk_bj_cama(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1480,7 +1480,7 @@ void DrasculaEngine::talk_bj_cama(const char *dicho, const char *filename) { int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1513,7 +1513,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 104, 102); + centra_texto(said, 104, 102); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1537,7 +1537,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_htel(const char *dicho, const char *filename) { +void DrasculaEngine::talk_htel(const char *said, const char *filename) { int tiempou; long tiempol; char *num_cara; @@ -1546,7 +1546,7 @@ void DrasculaEngine::talk_htel(const char *dicho, const char *filename) { int cara, pantalla; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1582,7 +1582,7 @@ bucless: copyBackground(x_talk[cara], 1, 45, 24, 92, 108, (byte *)num_cara, dir_zona_pantalla); if (withVoices == 0) - centra_texto(dicho, 90, 50); + centra_texto(said, 90, 50); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); pause(3); @@ -1606,7 +1606,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_sinc(const char *dicho, const char *filename, const char *sincronia) { +void DrasculaEngine::talk_sinc(const char *said, const char *filename, const char *sincronia) { int suma_1_pixel = 1; int y_mask_talk = 170; int x_talk_dch[6] = {1, 25, 49, 73, 97, 121}; @@ -1614,7 +1614,7 @@ void DrasculaEngine::talk_sinc(const char *dicho, const char *filename, const ch int p, cara = 0; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); color_abc(YELLOW); @@ -1704,7 +1704,7 @@ bucless: } if (withVoices == 0) - centra_texto(dicho, hare_x, hare_y); + centra_texto(said, hare_x, hare_y); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1727,18 +1727,18 @@ bucless: } 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); + playMusic(roomMusic); + if (num_ejec == 2 && musicStatus() == 0 && flags[11] == 0 && roomMusic != 0) + playMusic(roomMusic); } -void DrasculaEngine::talk_baul(const char *dicho, const char *filename) { +void DrasculaEngine::talk_baul(const char *said, const char *filename) { int tiempou; long tiempol; int cara = 0, cara_antes; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1770,7 +1770,7 @@ bucless: updateRoom(); if (withVoices == 0) - centra_texto(dicho, 263, 69); + centra_texto(said, 263, 69); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1796,12 +1796,12 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_igorpuerta(const char *dicho, const char *filename) { +void DrasculaEngine::talk_igorpuerta(const char *said, const char *filename) { int tiempou; long tiempol; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1824,7 +1824,7 @@ bucless: updateRoom(); if (withVoices == 0) - centra_texto(dicho, 87, 66); + centra_texto(said, 87, 66); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); int key = getscan(); @@ -1846,7 +1846,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_igor_sentado(const char *dicho, const char *filename) { +void DrasculaEngine::talk_igor_sentado(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1854,7 +1854,7 @@ void DrasculaEngine::talk_igor_sentado(const char *dicho, const char *filename) int cara; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1886,7 +1886,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 221, 102); + centra_texto(said, 221, 102); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -1911,7 +1911,7 @@ bucless: updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } -void DrasculaEngine::talk_igor_peluca(const char *dicho, const char *filename) { +void DrasculaEngine::talk_igor_peluca(const char *said, const char *filename) { int tiempou; long tiempol; @@ -1919,7 +1919,7 @@ void DrasculaEngine::talk_igor_peluca(const char *dicho, const char *filename) { int cara = 0; int longitud; - longitud = strlen(dicho); + longitud = strlen(said); tiempol = _system->getMillis(); tiempou = (unsigned int)tiempol / 2; @@ -1951,7 +1951,7 @@ bucless: updateRefresh(); if (withVoices == 0) - centra_texto(dicho, 221, 102); + centra_texto(said, 221, 102); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); |