diff options
| author | Eugene Sandulenko | 2010-08-25 07:41:54 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-08-25 07:41:54 +0000 |
| commit | 3e4f6b4a2409512eed7d0ef048b7d6adb0ea3715 (patch) | |
| tree | e00f1b1a5ffc0b2ee9a7015d81e4dab83eb09b54 /engines/scumm | |
| parent | 99c9ba697c0ae0296a3042166e09171123000525 (diff) | |
| download | scummvm-rg350-3e4f6b4a2409512eed7d0ef048b7d6adb0ea3715.tar.gz scummvm-rg350-3e4f6b4a2409512eed7d0ef048b7d6adb0ea3715.tar.bz2 scummvm-rg350-3e4f6b4a2409512eed7d0ef048b7d6adb0ea3715.zip | |
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.
svn-id: r52375
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/scumm.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index b0b86516e7..75c507565c 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -2117,7 +2117,12 @@ void ScummEngine::scummLoop_updateScummVars() { // 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 { |