aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-04 18:08:19 +0000
committerFilippos Karapetis2008-06-04 18:08:19 +0000
commitb0eb20b4b8e829200b538a32b6333c5b893225cb (patch)
treed0407893d095b642b29d4adf7638f27c7dc80ae2 /engines
parentf21a15cbbbb85780aad26a9df648f0ee16349ea1 (diff)
downloadscummvm-rg350-b0eb20b4b8e829200b538a32b6333c5b893225cb.tar.gz
scummvm-rg350-b0eb20b4b8e829200b538a32b6333c5b893225cb.tar.bz2
scummvm-rg350-b0eb20b4b8e829200b538a32b6333c5b893225cb.zip
Fixed the animation where the window is broken by the spear outside the church
svn-id: r32542
Diffstat (limited to 'engines')
-rw-r--r--engines/drascula/animation.cpp18
-rw-r--r--engines/drascula/talk.cpp4
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 14d73ddd3d..cdc2f1ea8b 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -2480,20 +2480,18 @@ void DrasculaEngine::animation_5_2() {
copyBackground(1, 1, 213, 66, 53,84, backSurface, screenSurface);
updateScreen();
- // FIXME: the widths in these calls were 53 and 52 (by mistake, probably).
- // I've set them to 53, but if any problems arise, we should try 52 as well
- updateAnim(1, 213, 66, 53, 84, 6, backSurface);
- updateAnim(86, 213, 66, 53, 84, 6, backSurface);
- updateAnim(1, 213, 66, 53, 84, 6, extraSurface);
- updateAnim(1, 213, 66, 53, 84, 6, extraSurface);
- updateAnim(86, 213, 66, 53, 84, 6, extraSurface);
- updateAnim(1, 213, 66, 53, 84, 6, frontSurface);
+ updateAnim(1, 213, 66, 52, 84, 6, backSurface);
+ updateAnim(86, 213, 66, 52, 84, 6, backSurface);
+ updateAnim(1, 213, 66, 52, 84, 6, extraSurface);
+ updateAnim(1, 213, 66, 52, 84, 6, extraSurface);
+ updateAnim(86, 213, 66, 52, 84, 6, extraSurface);
+ updateAnim(1, 213, 66, 52, 84, 6, frontSurface);
playSound(1);
- updateAnim(86, 213, 66, 53, 84, 6, frontSurface);
+ updateAnim(86, 213, 66, 52, 84, 6, frontSurface);
stopSound();
- updateAnim(1, 213, 66, 53, 84, 6, drawSurface3);
+ updateAnim(1, 213, 66, 52, 84, 6, drawSurface3);
loadPic(994, backSurface);
loadPic(974, extraSurface);
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index c273c5c5a9..9d521293f5 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -904,6 +904,7 @@ void DrasculaEngine::talk_sync(const char *said, const char *filename, const cha
int y_mask_talk = 170;
int p, face = 0;
int length = strlen(said);
+ char buf[1];
color_abc(kColorYellow);
@@ -917,7 +918,8 @@ void DrasculaEngine::talk_sync(const char *said, const char *filename, const cha
talkInit(filename);
do {
- face = atoi(&syncChar[p]);
+ strncpy(buf, &syncChar[p], 1);
+ face = atoi(buf);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);