[Scummvm-cvs-logs] SF.net SVN: scummvm:[49764] scummvm/trunk/engines/scumm/scumm.cpp

[sev at users.sourceforge.net]

Revision: 49764
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49764&view=rev
Author:   sev
Date:     2010-06-15 10:46:23 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-06-15 10:46:04 UTC (rev 49763)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-06-15 10:46:23 UTC (rev 49764)
@@ -2081,6 +2081,12 @@
 	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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.