diff options
| author | Max Horn | 2006-09-17 20:36:48 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-17 20:36:48 +0000 |
| commit | 51017cf1b21f450acad9c735e9364f5bb5d35f17 (patch) | |
| tree | c61007341218b4522350f23cf646a2376b0bf3be /engines/scumm/resource_v2.cpp | |
| parent | 8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0 (diff) | |
| download | scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.gz scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.tar.bz2 scummvm-rg350-51017cf1b21f450acad9c735e9364f5bb5d35f17.zip | |
Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
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 e1a12aac86..a503e1291d 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -87,40 +87,40 @@ void ScummEngine_v2::readClassicIndexFile() { } for (i = 0; i < _numRooms; i++) { - res.roomno[rtRoom][i] = i; + _res->roomno[rtRoom][i] = i; } _fileHandle->seek(_numRooms, SEEK_CUR); for (i = 0; i < _numRooms; i++) { - res.roomoffs[rtRoom][i] = _fileHandle->readUint16LE(); - if (res.roomoffs[rtRoom][i] == 0xFFFF) - res.roomoffs[rtRoom][i] = 0xFFFFFFFF; + _res->roomoffs[rtRoom][i] = _fileHandle->readUint16LE(); + if (_res->roomoffs[rtRoom][i] == 0xFFFF) + _res->roomoffs[rtRoom][i] = 0xFFFFFFFF; } for (i = 0; i < _numCostumes; i++) { - res.roomno[rtCostume][i] = _fileHandle->readByte(); + _res->roomno[rtCostume][i] = _fileHandle->readByte(); } for (i = 0; i < _numCostumes; i++) { - res.roomoffs[rtCostume][i] = _fileHandle->readUint16LE(); - if (res.roomoffs[rtCostume][i] == 0xFFFF) - res.roomoffs[rtCostume][i] = 0xFFFFFFFF; + _res->roomoffs[rtCostume][i] = _fileHandle->readUint16LE(); + if (_res->roomoffs[rtCostume][i] == 0xFFFF) + _res->roomoffs[rtCostume][i] = 0xFFFFFFFF; } for (i = 0; i < _numScripts; i++) { - res.roomno[rtScript][i] = _fileHandle->readByte(); + _res->roomno[rtScript][i] = _fileHandle->readByte(); } for (i = 0; i < _numScripts; i++) { - res.roomoffs[rtScript][i] = _fileHandle->readUint16LE(); - if (res.roomoffs[rtScript][i] == 0xFFFF) - res.roomoffs[rtScript][i] = 0xFFFFFFFF; + _res->roomoffs[rtScript][i] = _fileHandle->readUint16LE(); + if (_res->roomoffs[rtScript][i] == 0xFFFF) + _res->roomoffs[rtScript][i] = 0xFFFFFFFF; } for (i = 0; i < _numSounds; i++) { - res.roomno[rtSound][i] = _fileHandle->readByte(); + _res->roomno[rtSound][i] = _fileHandle->readByte(); } for (i = 0; i < _numSounds; i++) { - res.roomoffs[rtSound][i] = _fileHandle->readUint16LE(); - if (res.roomoffs[rtSound][i] == 0xFFFF) - res.roomoffs[rtSound][i] = 0xFFFFFFFF; + _res->roomoffs[rtSound][i] = _fileHandle->readUint16LE(); + if (_res->roomoffs[rtSound][i] == 0xFFFF) + _res->roomoffs[rtSound][i] = 0xFFFFFFFF; } } |