diff options
| author | Travis Howell | 2003-10-06 23:12:01 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-06 23:12:01 +0000 |
| commit | f57a6d74a1b198a8d892f5076b8f5abd3ab5d1ef (patch) | |
| tree | 37aa1f0ce35d622a418382ec320c791109bdabe0 | |
| parent | 16ee37f81723c68d5221c001e2be97153d390648 (diff) | |
| download | scummvm-rg350-f57a6d74a1b198a8d892f5076b8f5abd3ab5d1ef.tar.gz scummvm-rg350-f57a6d74a1b198a8d892f5076b8f5abd3ab5d1ef.tar.bz2 scummvm-rg350-f57a6d74a1b198a8d892f5076b8f5abd3ab5d1ef.zip | |
Fix text when room scrolls in game versions < 3.
Manual redraw of verbs areas isn't require after reload of game in loom/loomcd, causes glitches in some locations.
svn-id: r10648
| -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); |