aboutsummaryrefslogtreecommitdiff
path: root/scumm/camera.cpp
diff options
context:
space:
mode:
authorMax Horn2004-04-04 20:20:09 +0000
committerMax Horn2004-04-04 20:20:09 +0000
commit71bbdbfae41545f68713642bb9f395cb234bb60c (patch)
tree578af5fcad20139cd775a45ac10248dd1b8a2302 /scumm/camera.cpp
parent749d75cdcbfe0dfc9aa73e37648d81e28ecb7098 (diff)
downloadscummvm-rg350-71bbdbfae41545f68713642bb9f395cb234bb60c.tar.gz
scummvm-rg350-71bbdbfae41545f68713642bb9f395cb234bb60c.tar.bz2
scummvm-rg350-71bbdbfae41545f68713642bb9f395cb234bb60c.zip
Removed CharsetRenderer::_mask (this was used to optimize charset mask handling). This shouldn't cause any noticable slowdowns, but allows us to get rid of two nasty hacks, and fixes bug #895355 (DIG: Subtitles sometimes stay on the screen), maybe also others
svn-id: r13464
Diffstat (limited to 'scumm/camera.cpp')
-rw-r--r--scumm/camera.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index d6e0b17b65..6411e7d202 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -338,23 +338,6 @@ void ScummEngine::cameraMoved() {
#else
virtscr[0].xstart = _screenStartStrip * 8;
#endif
-
- if (_charset->_hasMask && _version > 3) {
- int dx = camera._cur.x - camera._last.x;
- int dy = camera._cur.y - camera._last.y;
-
- // 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 || _gameId == GID_PASS) && dx)
- _charset->_mask.left -= 8;
- else if (dx || dy) {
- _charset->_mask.left -= dx;
- _charset->_mask.right -= dx;
- _charset->_mask.top -= dy;
- _charset->_mask.bottom -= dy;
- }
- }
}
void ScummEngine::panCameraTo(int x, int y) {