diff options
| author | Max Horn | 2011-05-13 14:48:01 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-13 14:48:01 +0200 |
| commit | 9ec64a66fe2f20eb1be0811b5f733332efff1b93 (patch) | |
| tree | 05e4ab45757882708f15872e7f2e25693295e21d /engines/scumm/resource_v2.cpp | |
| parent | cf513e3ed64556d05383209664a0cd3909f45399 (diff) | |
| download | scummvm-rg350-9ec64a66fe2f20eb1be0811b5f733332efff1b93.tar.gz scummvm-rg350-9ec64a66fe2f20eb1be0811b5f733332efff1b93.tar.bz2 scummvm-rg350-9ec64a66fe2f20eb1be0811b5f733332efff1b93.zip | |
SCUMM: Turned ResTypeData into a Common::Array<Resource>, subsuming its _resource member
Diffstat (limited to 'engines/scumm/resource_v2.cpp')
| -rw-r--r-- | engines/scumm/resource_v2.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 38dfa7c0ca..927ee676a5 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -84,40 +84,40 @@ void ScummEngine_v2::readClassicIndexFile() { } for (i = 0; i < _numRooms; i++) { - _res->_types[rtRoom]._resources[i]._roomno = i; + _res->_types[rtRoom][i]._roomno = i; } _fileHandle->seek(_numRooms, SEEK_CUR); for (i = 0; i < _numRooms; i++) { - _res->_types[rtRoom]._resources[i]._roomoffs = _fileHandle->readUint16LE(); - if (_res->_types[rtRoom]._resources[i]._roomoffs == 0xFFFF) - _res->_types[rtRoom]._resources[i]._roomoffs = (uint32)RES_INVALID_OFFSET; + _res->_types[rtRoom][i]._roomoffs = _fileHandle->readUint16LE(); + if (_res->_types[rtRoom][i]._roomoffs == 0xFFFF) + _res->_types[rtRoom][i]._roomoffs = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numCostumes; i++) { - _res->_types[rtCostume]._resources[i]._roomno = _fileHandle->readByte(); + _res->_types[rtCostume][i]._roomno = _fileHandle->readByte(); } for (i = 0; i < _numCostumes; i++) { - _res->_types[rtCostume]._resources[i]._roomoffs = _fileHandle->readUint16LE(); - if (_res->_types[rtCostume]._resources[i]._roomoffs == 0xFFFF) - _res->_types[rtCostume]._resources[i]._roomoffs = (uint32)RES_INVALID_OFFSET; + _res->_types[rtCostume][i]._roomoffs = _fileHandle->readUint16LE(); + if (_res->_types[rtCostume][i]._roomoffs == 0xFFFF) + _res->_types[rtCostume][i]._roomoffs = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numScripts; i++) { - _res->_types[rtScript]._resources[i]._roomno = _fileHandle->readByte(); + _res->_types[rtScript][i]._roomno = _fileHandle->readByte(); } for (i = 0; i < _numScripts; i++) { - _res->_types[rtScript]._resources[i]._roomoffs = _fileHandle->readUint16LE(); - if (_res->_types[rtScript]._resources[i]._roomoffs == 0xFFFF) - _res->_types[rtScript]._resources[i]._roomoffs = (uint32)RES_INVALID_OFFSET; + _res->_types[rtScript][i]._roomoffs = _fileHandle->readUint16LE(); + if (_res->_types[rtScript][i]._roomoffs == 0xFFFF) + _res->_types[rtScript][i]._roomoffs = (uint32)RES_INVALID_OFFSET; } for (i = 0; i < _numSounds; i++) { - _res->_types[rtSound]._resources[i]._roomno = _fileHandle->readByte(); + _res->_types[rtSound][i]._roomno = _fileHandle->readByte(); } for (i = 0; i < _numSounds; i++) { - _res->_types[rtSound]._resources[i]._roomoffs = _fileHandle->readUint16LE(); - if (_res->_types[rtSound]._resources[i]._roomoffs == 0xFFFF) - _res->_types[rtSound]._resources[i]._roomoffs = (uint32)RES_INVALID_OFFSET; + _res->_types[rtSound][i]._roomoffs = _fileHandle->readUint16LE(); + if (_res->_types[rtSound][i]._roomoffs == 0xFFFF) + _res->_types[rtSound][i]._roomoffs = (uint32)RES_INVALID_OFFSET; } } |