[Scummvm-cvs-logs] SF.net SVN: scummvm:[52892] scummvm/branches/branch-1-2-0/engines/scumm/ scumm.cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Sep 25 22:51:35 CEST 2010


Revision: 52892
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52892&view=rev
Author:   sev
Date:     2010-09-25 20:51:35 +0000 (Sat, 25 Sep 2010)

Log Message:
-----------
SCUMM: backport fix for bug #3052804

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/scumm/scumm.cpp

Modified: scummvm/branches/branch-1-2-0/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/scumm/scumm.cpp	2010-09-25 20:50:13 UTC (rev 52891)
+++ scummvm/branches/branch-1-2-0/engines/scumm/scumm.cpp	2010-09-25 20:51:35 UTC (rev 52892)
@@ -2124,6 +2124,7 @@
 		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 @@
 		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;


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




More information about the Scummvm-git-logs mailing list