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

[sev at users.sourceforge.net]

Revision: 52375
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52375&view=rev
Author:   sev
Date:     2010-08-25 07:41:54 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
SCUMM: Fix bug #3039004

Bug #3039004: "MANIACNES: Ed does not appear at doorway."
Actually whole thing is a gross hack on top of SCUMM v1.5 hack
with extra wide screen. It all calls for review and writing
specified methods.

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

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-08-25 07:41:35 UTC (rev 52374)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-08-25 07:41:54 UTC (rev 52375)
@@ -2117,7 +2117,12 @@
 		// 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;
+		// But do not do it when only scrolling right to left, since otherwise Ed will not show
+		// up on the doorbell (Bug #3039004)
+		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
+			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;
 	} else {


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