diff options
| author | Max Horn | 2003-05-08 21:14:21 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 21:14:21 +0000 |
| commit | 4d7f7a8c80fdf78cf29f8517546a5a2a89694bab (patch) | |
| tree | e307c440fc021bdf05bec1615d8808f05af49383 | |
| parent | af14dabc75d23ea1bec9bffecbd5de2756ad561a (diff) | |
| download | scummvm-rg350-4d7f7a8c80fdf78cf29f8517546a5a2a89694bab.tar.gz scummvm-rg350-4d7f7a8c80fdf78cf29f8517546a5a2a89694bab.tar.bz2 scummvm-rg350-4d7f7a8c80fdf78cf29f8517546a5a2a89694bab.zip | |
yet more v2 var fixes
svn-id: r7397
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/script.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 9b633b2a91..1ae0682a83 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1982,7 +1982,7 @@ void Scumm::setCameraAt(int pos_x, int pos_y) { if (camera._cur.x > VAR(VAR_CAMERA_MAX_X)) camera._cur.x = VAR(VAR_CAMERA_MAX_X); - if (VAR(VAR_SCROLL_SCRIPT)) { + if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) { VAR(VAR_CAMERA_POS_X) = camera._cur.x; runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0); } diff --git a/scumm/script.cpp b/scumm/script.cpp index 8a72b423e1..728b84cadf 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -589,10 +589,14 @@ bool Scumm::isScriptInUse(int script) { void Scumm::runHook(int i) { - int tmp[16]; - tmp[0] = i; - if (VAR(VAR_HOOK_SCRIPT)) { - runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp); + if (_features & GF_AFTER_V2) { + // FIXME - TODO + } else { + int tmp[16]; + tmp[0] = i; + if (VAR(VAR_HOOK_SCRIPT)) { + runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp); + } } } |