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/he | |
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/he')
-rw-r--r-- | engines/scumm/he/resource_he.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/he/script_v72he.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 1dce01ae5a..6b195bec84 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -226,7 +226,7 @@ void ScummEngine_v70he::readRoomsOffsets() { num = READ_LE_UINT16(_heV7RoomOffsets); ptr = _heV7RoomOffsets + 2; for (i = 0; i < num; i++) { - _res->_types[rtRoom]._resources[i]._roomoffs = READ_LE_UINT32(ptr); + _res->_types[rtRoom][i]._roomoffs = READ_LE_UINT32(ptr); ptr += 4; } } diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 0e25fe4849..8f16bf0f3a 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -625,7 +625,7 @@ void ScummEngine_v72he::o72_getNumFreeArrays() { int i, num = 0; for (i = 1; i < _numArray; i++) { - if (!rtd._resources[i]._address) + if (!rtd[i]._address) num++; } |