From 71bbdbfae41545f68713642bb9f395cb234bb60c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 4 Apr 2004 20:20:09 +0000
Subject: 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
---
 scumm/camera.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'scumm/camera.cpp')

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) {
-- 
cgit v1.2.3