From f965616552a4a0d569a73be0649a11e4dd6dd96a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 25 Sep 2010 20:50:13 +0000
Subject: SCUMM: Fix bug #3052804 by reverting NES-specific screen width hack

svn-id: r52891
---
 engines/scumm/scumm.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/scumm')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 6a841b7a2d..0f1b43cedb 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2124,6 +2124,7 @@ void ScummEngine::scummLoop_updateScummVars() {
 		VAR(VAR_CAMERA_POS_X) = camera._cur.x;
 		VAR(VAR_CAMERA_POS_Y) = camera._cur.y;
 	} else if (_game.platform == Common::kPlatformNES) {
+#if 0
 		// WORKAROUND:
 		// Since there are 2 2-stripes wide borders in MM NES screen,
 		// we have to compensate for it here. This fixes paning effects.
@@ -2133,6 +2134,7 @@ void ScummEngine::scummLoop_updateScummVars() {
 		if (VAR(VAR_CAMERA_POS_X) < (camera._cur.x >> V12_X_SHIFT) + 2)
 			VAR(VAR_CAMERA_POS_X) = (camera._cur.x >> V12_X_SHIFT) + 2;
 		else
+#endif
 			VAR(VAR_CAMERA_POS_X) = (camera._cur.x >> V12_X_SHIFT);
 	} else if (_game.version <= 2) {
 		VAR(VAR_CAMERA_POS_X) = camera._cur.x >> V12_X_SHIFT;
-- 
cgit v1.2.3