aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-07 11:43:54 +0000
committerFilippos Karapetis2008-06-07 11:43:54 +0000
commitd3adb312c98862b696f1f12ac01bc470e4ee34f5 (patch)
tree16732003a37ab70a3fb061f3078c2ad6fb6f410f /engines
parent7192c88b19d4f89f86f7b0fa1c08349e45c6b3c8 (diff)
downloadscummvm-rg350-d3adb312c98862b696f1f12ac01bc470e4ee34f5.tar.gz
scummvm-rg350-d3adb312c98862b696f1f12ac01bc470e4ee34f5.tar.bz2
scummvm-rg350-d3adb312c98862b696f1f12ac01bc470e4ee34f5.zip
Fixed regression from last commit
svn-id: r32590
Diffstat (limited to 'engines')
-rw-r--r--engines/drascula/drascula.h2
-rw-r--r--engines/drascula/talk.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 25177f2210..8167fc136a 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -426,7 +426,7 @@ public:
void talk_vonBraunpuerta(int);
void talk_blind(int);
void talk_hacker(int);
- void talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords);
+ void talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords, byte* surface);
void hiccup(int);
void finishSound();
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index b63e14e670..7a16b8d976 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -461,7 +461,7 @@ void DrasculaEngine::talk_pianist(int index) {
int coords[7] = { 139, 228, 112, 47, 60, 221, 128 };
color_abc(kColorWhite);
- talk_generic(said, filename, x_talk, 4, coords);
+ talk_generic(said, filename, x_talk, 4, coords, extraSurface);
}
void DrasculaEngine::talk_drunk(int index) {
@@ -483,7 +483,7 @@ void DrasculaEngine::talk_drunk(int index) {
color_abc(kColorDarkGreen);
- talk_generic(said, filename, x_talk, 8, coords);
+ talk_generic(said, filename, x_talk, 8, coords, frontSurface);
flags[13] = 0;
if (currentChapter == 1)
@@ -651,7 +651,7 @@ void DrasculaEngine::talk_werewolf(int index) {
int coords[7] = { 136, 198, 81, 26, 24, 203, 78 };
color_abc(kColorRed);
- talk_generic(said, filename, x_talk, 9, coords);
+ talk_generic(said, filename, x_talk, 9, coords, drawSurface3);
}
void DrasculaEngine::talk_mus(int index) {
@@ -662,7 +662,7 @@ void DrasculaEngine::talk_mus(int index) {
int coords[7] = { 156, 190, 64, 18, 24, 197, 64 };
color_abc(kColorWhite);
- talk_generic(said, filename, x_talk, 8, coords);
+ talk_generic(said, filename, x_talk, 8, coords, drawSurface3);
}
void DrasculaEngine::talk_pen(const char *said, const char *filename, int talkerType) {
@@ -944,7 +944,7 @@ void DrasculaEngine::talk_dr_grande(int index) {
} while (!isTalkFinished(&length));
}
-void DrasculaEngine::talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords) {
+void DrasculaEngine::talk_generic(const char* said, const char* filename, int* faces, int faceCount, int* coords, byte* surface) {
int face;
int length = strlen(said);
talkInit(filename);
@@ -955,7 +955,7 @@ void DrasculaEngine::talk_generic(const char* said, const char* filename, int* f
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateRefresh_pre();
copyBackground(faces[face], coords[0], coords[1], coords[2],
- coords[3], coords[4], drawSurface3, screenSurface);
+ coords[3], coords[4], surface, screenSurface);
moveCharacters();
updateRefresh();