diff options
| author | Max Horn | 2002-12-24 23:26:37 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-24 23:26:37 +0000 |
| commit | 13518c3d362f105a3d0e224c17de9ddc662f978b (patch) | |
| tree | b4a9331256105f1828a99fafa630015403841482 /scumm/script.cpp | |
| parent | 190685dc69dad12563ccf8ed3689ec1f34cff360 (diff) | |
| download | scummvm-rg350-13518c3d362f105a3d0e224c17de9ddc662f978b.tar.gz scummvm-rg350-13518c3d362f105a3d0e224c17de9ddc662f978b.tar.bz2 scummvm-rg350-13518c3d362f105a3d0e224c17de9ddc662f978b.zip | |
enabled room & local scripts in V8; some more opcodes
svn-id: r6105
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 074c985d90..97b045b33f 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -247,8 +247,13 @@ void Scumm::getScriptBaseAddress() case 3: case WIO_ROOM: /* room script */ - _scriptOrgPointer = getResourceAddress(rtRoom, _roomResource); - _lastCodePtr = &_baseRooms[_roomResource]; + if (_features & GF_AFTER_V8) { + _scriptOrgPointer = getResourceAddress(rtRoomScripts, _roomResource); + _lastCodePtr = &res.address[rtRoomScripts][_roomResource]; + } else { + _scriptOrgPointer = getResourceAddress(rtRoom, _roomResource); + _lastCodePtr = &_baseRooms[_roomResource]; + } break; case WIO_GLOBAL: /* global script */ |