aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2010-06-15 10:46:23 +0000
committerEugene Sandulenko2010-06-15 10:46:23 +0000
commitba72975d3f5e88691506c670158ccda2e542013b (patch)
treebec5f17a5432e2f4b22fb0df96e3992b21ebc6a5
parent48d0d3008b3e886f06f63a9a67733cb3de8fcb0a (diff)
downloadscummvm-rg350-ba72975d3f5e88691506c670158ccda2e542013b.tar.gz
scummvm-rg350-ba72975d3f5e88691506c670158ccda2e542013b.tar.bz2
scummvm-rg350-ba72975d3f5e88691506c670158ccda2e542013b.zip
SCUMM: Fix bug #1328120:
Bug #1328120: "MANIACNES: Screen width incorrect, camera halts sometimes". Fixed by workaround and was tested with intro and on the kitchen, where now it is possible to see Edna without her noticing you first. svn-id: r49764
-rw-r--r--engines/scumm/scumm.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index bb50ce7bb2..862353bf95 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2081,6 +2081,12 @@ void ScummEngine::scummLoop_updateScummVars() {
if (_game.version >= 7) {
VAR(VAR_CAMERA_POS_X) = camera._cur.x;
VAR(VAR_CAMERA_POS_Y) = camera._cur.y;
+ } else if (_game.platform == Common::kPlatformNES) {
+ // WORKAROUND:
+ // Since there are 2 2-stripes wide borders in MM NES screen,
+ // we have to compensate for it here. This fixes paning effects.
+ // Fixes bug #1328120: "MANIACNES: Screen width incorrect, camera halts sometimes"
+ VAR(VAR_CAMERA_POS_X) = (camera._cur.x >> V12_X_SHIFT) + 2;
} else if (_game.version <= 2) {
VAR(VAR_CAMERA_POS_X) = camera._cur.x >> V12_X_SHIFT;
} else {