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/object.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/object.cpp')
-rw-r--r-- | engines/scumm/object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index edcf54dac0..fb99d6ce7d 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -193,10 +193,10 @@ void ScummEngine::clearOwnerOf(int obj) { _inventory[i] = _inventory[i+1]; _inventory[i+1] = 0; // FIXME FIXME FIXME: This is incomplete, as we do not touch flags, status... BUG - _res->_types[rtInventory]._resources[i]._address = _res->_types[rtInventory]._resources[i + 1]._address; - _res->_types[rtInventory]._resources[i]._size = _res->_types[rtInventory]._resources[i + 1]._size; - _res->_types[rtInventory]._resources[i + 1]._address = NULL; - _res->_types[rtInventory]._resources[i + 1]._size = 0; + _res->_types[rtInventory][i]._address = _res->_types[rtInventory][i + 1]._address; + _res->_types[rtInventory][i]._size = _res->_types[rtInventory][i + 1]._size; + _res->_types[rtInventory][i + 1]._address = NULL; + _res->_types[rtInventory][i + 1]._size = 0; } } break; @@ -1799,7 +1799,7 @@ int ScummEngine::findLocalObjectSlot() { int ScummEngine::findFlObjectSlot() { int i; for (i = 1; i < _numFlObject; i++) { - if (_res->_types[rtFlObject]._resources[i]._address == NULL) + if (_res->_types[rtFlObject][i]._address == NULL) return i; } error("findFlObjectSlot: Out of FLObject slots"); |