From dacbe84029cd69303c500b8ac502b8e6ffa4af9c Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sun, 4 Jan 2004 14:10:06 +0000 Subject: Fix a few subtitles glitches in loomcd during cutscenes. svn-id: r12136 --- scumm/camera.cpp | 10 ++++++++-- 1 file 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; -- cgit v1.2.3