diff options
| author | Paweł Kołodziejski | 2008-05-11 10:28:25 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2008-05-11 10:28:25 +0000 |
| commit | 8e7994ada8c86f2add740d5c27ee67088ded916e (patch) | |
| tree | 481cb4c515cc905dfca0295e8fb9175440c01df4 /engines/drascula/talk.cpp | |
| parent | d176a32f2e13e2f2f4b272a1be48e71c30bbd8be (diff) | |
| download | scummvm-rg350-8e7994ada8c86f2add740d5c27ee67088ded916e.tar.gz scummvm-rg350-8e7994ada8c86f2add740d5c27ee67088ded916e.tar.bz2 scummvm-rg350-8e7994ada8c86f2add740d5c27ee67088ded916e.zip | |
NUM_BANDERAS -> NUM_FLAGS
ANCHOBJ -> OBJWIDTH
ALTOBJ -> OBJHEIGHT
ANCHO_LETRAS -> CHAR_WIDTH
X_GUION -> X_HYPHEN
X_GUION -> X_HYPHEN_OPC
X_ABRE_PARENTESIS -> X_BRACKET_OPEN
X_ABRE_PARENTESIS_OPC -> X_BRACKET_OPEN_OPC
X_CIERRA_PARENTESIS -> X_BRACKET_CLOSE
X_CIERRA_PARENTESIS_OPC -> X_BRACKET_CLOSE_OPC
svn-id: r32007
Diffstat (limited to 'engines/drascula/talk.cpp')
| -rw-r--r-- | engines/drascula/talk.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index 4fb1d351d0..d0ae9de7ac 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -616,9 +616,9 @@ bucless: updateRefresh_pre(); if (num_ejec == 2) - copyBackground(hare_x, hare_y, ANCHOBJ + 1, 0, ancho_hare, alto_talk - 1, dir_zona_pantalla, dir_dibujo3); + copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, alto_talk - 1, dir_zona_pantalla, dir_dibujo3); else - copyBackground(hare_x, hare_y, ANCHOBJ + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), + copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), dir_zona_pantalla, dir_dibujo3); @@ -626,9 +626,9 @@ bucless: if (num_ejec == 2) { if (!strcmp(fondo_y_menu, "99.alg") || !strcmp(fondo_y_menu, "994.alg")) - copyBackground(ANCHOBJ + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, dir_dibujo3, dir_zona_pantalla); + copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, dir_dibujo3, dir_zona_pantalla); } else { - copyBackground(ANCHOBJ + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), + copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), dir_dibujo3, dir_zona_pantalla); } @@ -890,7 +890,7 @@ void DrasculaEngine::talk_vb(const char *dicho, const char *filename) { ctvd_output(sku); } - copyBackground(vb_x + 5, 64, ANCHOBJ + 1, 0, 25, 27, dir_dibujo1, dir_dibujo3); + copyBackground(vb_x + 5, 64, OBJWIDTH + 1, 0, 25, 27, dir_dibujo1, dir_dibujo3); bucless: @@ -901,7 +901,7 @@ bucless: pon_hare(); pon_vb(); - copyBackground(ANCHOBJ + 1, 0, vb_x + 5, 64, 25, 27, dir_dibujo3, dir_zona_pantalla); + copyBackground(OBJWIDTH + 1, 0, vb_x + 5, 64, 25, 27, dir_dibujo3, dir_zona_pantalla); copyRect(x_talk[cara], 34, vb_x + 5, 64, 25, 27, dir_hare_frente, dir_zona_pantalla); updateRefresh(); } @@ -1659,16 +1659,16 @@ bucless: updateRefresh_pre(); if (num_ejec == 2) - copyBackground(hare_x, hare_y, ANCHOBJ + 1, 0, ancho_hare, alto_talk - 1, dir_zona_pantalla, dir_dibujo3); + copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, alto_talk - 1, dir_zona_pantalla, dir_dibujo3); else - copyBackground(hare_x, hare_y, ANCHOBJ + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), + copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), dir_zona_pantalla, dir_dibujo3); pon_hare(); if (num_ejec == 2) { if (alto_hare != 56) - copyBackground(ANCHOBJ + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, dir_dibujo3, dir_zona_pantalla); + copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, dir_dibujo3, dir_zona_pantalla); } else - copyBackground(ANCHOBJ + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), + copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]), (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), dir_dibujo3, dir_zona_pantalla); if (sentido_hare == 0) { |