diff options
| author | Max Horn | 2011-05-13 11:45:42 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-13 11:47:13 +0200 |
| commit | c02420df43bec4ec523c18d8e6fdb381af29c1b5 (patch) | |
| tree | f595cd9d72f0b5ba5b98e80caf3544a0f0401830 /engines/scumm/script.cpp | |
| parent | abaaf0cad9a63c1a6f1946a8a90facd1535e762d (diff) | |
| download | scummvm-rg350-c02420df43bec4ec523c18d8e6fdb381af29c1b5.tar.gz scummvm-rg350-c02420df43bec4ec523c18d8e6fdb381af29c1b5.tar.bz2 scummvm-rg350-c02420df43bec4ec523c18d8e6fdb381af29c1b5.zip | |
SCUMM: Add a Resource class, refactor res code around it
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index e418fcd290..47cf8e024e 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -390,7 +390,7 @@ void ScummEngine::getScriptBaseAddress() { break; _scriptOrgPointer = getResourceAddress(rtInventory, idx); assert(idx < _numInventory); - _lastCodePtr = &_res->_types[rtInventory]._address[idx]; + _lastCodePtr = &_res->_types[rtInventory]._resources[idx]._address; break; case WIO_LOCAL: @@ -398,18 +398,18 @@ void ScummEngine::getScriptBaseAddress() { if (_game.version == 8) { _scriptOrgPointer = getResourceAddress(rtRoomScripts, _roomResource); assert(_roomResource < _res->_types[rtRoomScripts]._num); - _lastCodePtr = &_res->_types[rtRoomScripts]._address[_roomResource]; + _lastCodePtr = &_res->_types[rtRoomScripts]._resources[_roomResource]._address; } else { _scriptOrgPointer = getResourceAddress(rtRoom, _roomResource); assert(_roomResource < _numRooms); - _lastCodePtr = &_res->_types[rtRoom]._address[_roomResource]; + _lastCodePtr = &_res->_types[rtRoom]._resources[_roomResource]._address; } break; case WIO_GLOBAL: /* global script */ _scriptOrgPointer = getResourceAddress(rtScript, ss->number); assert(ss->number < _numScripts); - _lastCodePtr = &_res->_types[rtScript]._address[ss->number]; + _lastCodePtr = &_res->_types[rtScript]._resources[ss->number]._address; break; case WIO_FLOBJECT: /* flobject script */ @@ -418,7 +418,7 @@ void ScummEngine::getScriptBaseAddress() { idx = _objs[idx].fl_object_index; _scriptOrgPointer = getResourceAddress(rtFlObject, idx); assert(idx < _numFlObject); - _lastCodePtr = &_res->_types[rtFlObject]._address[idx]; + _lastCodePtr = &_res->_types[rtFlObject]._resources[idx]._address; break; default: error("Bad type while getting base address"); |