From dd1eb2a4b4b0eef3a771ba67d24e737f4f016e8d Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 6 Jan 2004 13:28:19 +0000
Subject: Fix subtitles glitch when subtitles are shown during room scroll in
 pass.

svn-id: r12179
---
 scumm/camera.cpp | 2 +-
 scumm/gfx.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 57cc1e8538..bf2f23ab46 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -346,7 +346,7 @@ void ScummEngine::cameraMoved() {
 		// 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)
+		if ((_gameId == GID_LOOM256 || _gameId == GID_PASS) && dx)
 			gdi._mask.left -= 8;
 		else if (dx || dy) {
 			gdi._mask.left -= dx;
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 3c96ea196a..caeeacbd8a 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -495,7 +495,7 @@ void ScummEngine::redrawBGAreas() {
 	int diff;
 
 	if (!(_features & GF_NEW_CAMERA))
-		if (camera._cur.x != camera._last.x && _charset->_hasMask && _version > 3)
+		if (camera._cur.x != camera._last.x && _charset->_hasMask && (_version > 3 && _gameId != GID_PASS))
 			stopTalk();
 
 	val = 0;
-- 
cgit v1.2.3