diff options
| -rw-r--r-- | scumm/camera.cpp | 4 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/scumm/camera.cpp b/scumm/camera.cpp index fdee036e4c..7c7581f349 100644 --- a/scumm/camera.cpp +++ b/scumm/camera.cpp @@ -57,8 +57,8 @@ void ScummEngine::setCameraAt(int pos_x, int pos_y) { } // If the camera moved and text is visible, remove it - if (camera._cur.x != camera._last.x && _charset->_hasMask) - stopTalk(); + //if (camera._cur.x != camera._last.x && _charset->_hasMask) + // stopTalk(); } void ScummEngine_v7::setCameraAt(int pos_x, int pos_y) { diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 381e6fb92a..dbd59c8ab7 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -731,7 +731,7 @@ void ScummEngine::redrawBGAreas() { int diff; if (!(_features & GF_NEW_CAMERA)) - if (camera._cur.x != camera._last.x && _charset->_hasMask) + if (camera._cur.x != camera._last.x && _charset->_hasMask && _version > 3) stopTalk(); val = 0; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 5c5638ecf6..dcab9f2701 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1371,7 +1371,6 @@ load_game: int args = 2; uint value = (_gameId == GID_LOOM256) ? 150 : 100; byte restoreScript = (_features & GF_FMTOWNS) ? 17 : 18; - redrawVerbs(); // if verbs should be shown restore them if (VAR(value) == 2) runScript(restoreScript, 0, 0, &args); |