aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorSven Hesse2008-05-25 06:25:16 +0000
committerSven Hesse2008-05-25 06:25:16 +0000
commit3f4d22338ed5b815a5a04cb74b473dc6b8b90c06 (patch)
tree5271a29ddcb16fc83efe499af54da95084379b5c /engines/gob
parentff573ec1e214c233a530a96798c0b33738bd8467 (diff)
downloadscummvm-rg350-3f4d22338ed5b815a5a04cb74b473dc6b8b90c06.tar.gz
scummvm-rg350-3f4d22338ed5b815a5a04cb74b473dc6b8b90c06.tar.bz2
scummvm-rg350-3f4d22338ed5b815a5a04cb74b473dc6b8b90c06.zip
Fixing Bug #1970111 ("WOODRUFF: Close Up not erased")
svn-id: r32266
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/videoplayer.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index ebc4edfc27..4a337d48b4 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -602,20 +602,19 @@ void VideoPlayer::writeVideoInfo(const char *videoFile, int16 varX, int16 varY,
if (primaryOpen(videoFile)) {
int16 x, y, width, height;
- if ((VAR_OFFSET(varX) != 0xFFFFFFFF) ||
- !_primaryVideo->getVideo()->getAnchor(1, 2, x, y, width, height)) {
+ x = _primaryVideo->getVideo()->getX();
+ y = _primaryVideo->getVideo()->getY();
+ width = _primaryVideo->getVideo()->getWidth();
+ height = _primaryVideo->getVideo()->getHeight();
- x = _primaryVideo->getVideo()->getX();
- y = _primaryVideo->getVideo()->getY();
- width = _primaryVideo->getVideo()->getWidth();
- height = _primaryVideo->getVideo()->getHeight();
- }
+ if (VAR_OFFSET(varX) == 0xFFFFFFFF)
+ _primaryVideo->getVideo()->getAnchor(1, 2, x, y, width, height);
WRITE_VAR_OFFSET(varX, x);
WRITE_VAR_OFFSET(varY, y);
WRITE_VAR_OFFSET(varFrames, _primaryVideo->getVideo()->getFramesCount());
WRITE_VAR_OFFSET(varWidth, width);
- WRITE_VAR_OFFSET(varHeight, height);
+ WRITE_VARO_UINT16(varHeight & 0xFFFFFFFC, height);
primaryClose();
} else {