aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-01-04 14:10:06 +0000
committerTravis Howell2004-01-04 14:10:06 +0000
commitdacbe84029cd69303c500b8ac502b8e6ffa4af9c (patch)
tree3d62573799429f277c0c5d440030bf6e704b176b
parente049e24a2c15543dd20bfb76976f3eea892b7949 (diff)
downloadscummvm-rg350-dacbe84029cd69303c500b8ac502b8e6ffa4af9c.tar.gz
scummvm-rg350-dacbe84029cd69303c500b8ac502b8e6ffa4af9c.tar.bz2
scummvm-rg350-dacbe84029cd69303c500b8ac502b8e6ffa4af9c.zip
Fix a few subtitles glitches in loomcd during cutscenes.
svn-id: r12136
-rw-r--r--scumm/camera.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index c35a93a5ca..ad9dec93c6 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -339,10 +339,16 @@ void ScummEngine::cameraMoved() {
virtscr[0].xstart = _screenStartStrip * 8;
#endif
- if (_charset->_hasMask && (_version >= 4 && _gameId != GID_LOOM256)) {
+ if (_charset->_hasMask && _version > 3) {
int dx = camera._cur.x - camera._last.x;
int dy = camera._cur.y - camera._last.y;
- if (dx || dy) {
+
+ // Fixes subtitle glitches during room scrolling in two cut scenes
+ // When talking to Rusty for first time
+ // When sleeping in straw at Blacksmith's Guild.
+ if (_gameId == GID_LOOM256 && dx)
+ gdi._mask.left -= 8;
+ else if (dx || dy) {
gdi._mask.left -= dx;
gdi._mask.right -= dx;
gdi._mask.top -= dy;