aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-25 20:50:13 +0000
committerEugene Sandulenko2010-09-25 20:50:13 +0000
commitf965616552a4a0d569a73be0649a11e4dd6dd96a (patch)
tree4b37f61d6925b4f3b462146d659def2a36ea26e1 /engines/scumm
parent73c5895ed26d49ae04600be8bf1247335e89fb4d (diff)
downloadscummvm-rg350-f965616552a4a0d569a73be0649a11e4dd6dd96a.tar.gz
scummvm-rg350-f965616552a4a0d569a73be0649a11e4dd6dd96a.tar.bz2
scummvm-rg350-f965616552a4a0d569a73be0649a11e4dd6dd96a.zip
SCUMM: Fix bug #3052804 by reverting NES-specific screen width hack
svn-id: r52891
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp2
1 files changed, 2 insertions, 0 deletions
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;