aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2008-03-09 08:05:40 +0000
committerPaweł Kołodziejski2008-03-09 08:05:40 +0000
commitbcbb7cc0db9279c00a53a1e24ea1a0a8c4c0ba2a (patch)
tree14499269f2cd589851a516cb3b6e2d50fc146c76
parent37b8d5bd4dd047cb2f14a10353ff41b9364fbd4d (diff)
downloadscummvm-rg350-bcbb7cc0db9279c00a53a1e24ea1a0a8c4c0ba2a.tar.gz
scummvm-rg350-bcbb7cc0db9279c00a53a1e24ea1a0a8c4c0ba2a.tar.bz2
scummvm-rg350-bcbb7cc0db9279c00a53a1e24ea1a0a8c4c0ba2a.zip
fixed wrong call
svn-id: r31072
-rw-r--r--engines/drascula/drascula.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 1d1a0ed5b3..a44273d264 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -123,7 +123,7 @@ int DrasculaEngine::init() {
}
int DrasculaEngine::go() {
- num_ejec = 0;
+ num_ejec = 3;
hay_que_load = 0;
for (;;) {
@@ -3324,7 +3324,7 @@ void DrasculaEngine::hablar(const char *dicho, const char *filename) {
long tiempol;
int suma_1_pixel = 0;
- if (num_ejec == 1 || num_ejec == 6)
+ if (num_ejec != 2)
suma_1_pixel = 1;
int y_mask_habla = 170;
@@ -3350,7 +3350,7 @@ void DrasculaEngine::hablar(const char *dicho, const char *filename) {
tiempou = (unsigned int)tiempol / 2;
_rnd->setSeed(tiempou);
- if (num_ejec == 1 || num_ejec == 6) {
+ if (num_ejec != 2) {
if (factor_red[hare_y + alto_hare] == 100)
suma_1_pixel = 0;
}
@@ -10512,6 +10512,9 @@ bucless:
if (longitud > 0)
goto bucless;
}
+ if (num_ejec == 1 || num_ejec == 2)
+ if (music_status() == 0 && flags[11] == 0 && musica_room != 0)
+ playmusic(musica_room);
}
void DrasculaEngine::habla_baul(const char *dicho, const char *filename) {
@@ -11588,7 +11591,7 @@ void DrasculaEngine::pantalla_30(int fl) {
if (flags[11] == 1 && flags[14] == 1)
flags[18] = 1;
if (flags[18] == 1)
- animacion_6_2();
+ animacion_6_4();
} else if (objeto_que_lleva == CERRAR && fl == 144)
cierra_puerta(16, 1);
else if (objeto_que_lleva == 13 && fl == 144) {