diff options
| author | James Brown | 2003-05-09 06:03:48 +0000 |
|---|---|---|
| committer | James Brown | 2003-05-09 06:03:48 +0000 |
| commit | ff3429ddab51d3a01de68e362bb54d833075815f (patch) | |
| tree | 77dedf7d5c9c578af82dcc2287f53ae8795c17c6 /scumm | |
| parent | c126cf2df83ee9ab4882c3e3387d5e73f8f12870 (diff) | |
| download | scummvm-rg350-ff3429ddab51d3a01de68e362bb54d833075815f.tar.gz scummvm-rg350-ff3429ddab51d3a01de68e362bb54d833075815f.tar.bz2 scummvm-rg350-ff3429ddab51d3a01de68e362bb54d833075815f.zip | |
V2 Vars Fix
svn-id: r7404
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index c5199366f6..6108d448f4 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2210,8 +2210,8 @@ void Scumm::moveCamera() { } cameraMoved(); - - if (pos != camera._cur.x && VAR(VAR_SCROLL_SCRIPT)) { + + if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT) && pos != camera._cur.x) { VAR(VAR_CAMERA_POS_X) = camera._cur.x; runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0); } @@ -2220,11 +2220,8 @@ void Scumm::moveCamera() { void Scumm::cameraMoved() { if (_features & GF_AFTER_V7) { - assert(camera._cur.x >= (_realWidth / 2) && camera._cur.y >= (_realHeight / 2)); - } else { - if (camera._cur.x < (_realWidth / 2)) { camera._cur.x = (_realWidth / 2); } else if (camera._cur.x > _scrWidth - (_realWidth / 2)) { |