aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-06 17:31:35 +0000
committerMax Horn2005-04-06 17:31:35 +0000
commit3d5b5f2ad83a5d4b463e9e78f204b132e36f770c (patch)
tree4d494a39724db4906bcb4add6522f35e2143ee10 /scumm/object.cpp
parent26e0ec1d240c71f5fdc34b912ee8ddf0368ab6dc (diff)
downloadscummvm-rg350-3d5b5f2ad83a5d4b463e9e78f204b132e36f770c.tar.gz
scummvm-rg350-3d5b5f2ad83a5d4b463e9e78f204b132e36f770c.tar.bz2
scummvm-rg350-3d5b5f2ad83a5d4b463e9e78f204b132e36f770c.zip
Moved createResource, resourceStats, expireResources to ResourceManager
svn-id: r17420
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 9d7464ccac..e0a4b32928 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -1125,7 +1125,7 @@ void ScummEngine::addObjectToInventory(uint obj, uint room) {
slot = getInventorySlot();
_inventory[slot] = obj;
- dst = createResource(rtInventory, slot, size);
+ dst = res.createResource(rtInventory, slot, size);
assert(dst);
memcpy(dst, ptr, size);
@@ -1661,7 +1661,7 @@ void ScummEngine::loadFlObject(uint object, uint room) {
// Allocate slot & memory for floating object
slot = findFlObjectSlot();
- flob = createResource(rtFlObject, slot, flob_size);
+ flob = res.createResource(rtFlObject, slot, flob_size);
assert(flob);
// Copy object code + object image to floating object