diff options
| author | Max Horn | 2006-09-23 11:29:32 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-23 11:29:32 +0000 |
| commit | d02e4d7f7c7affb4e6f52c0e5a9a8b5a0ca0c610 (patch) | |
| tree | 0752b64d29cf738449839c587e9dcd0b1d2d35c7 /engines/scumm/object.cpp | |
| parent | 847c145810919e6670a6d67e29b9e53b39502ca8 (diff) | |
| download | scummvm-rg350-d02e4d7f7c7affb4e6f52c0e5a9a8b5a0ca0c610.tar.gz scummvm-rg350-d02e4d7f7c7affb4e6f52c0e5a9a8b5a0ca0c610.tar.bz2 scummvm-rg350-d02e4d7f7c7affb4e6f52c0e5a9a8b5a0ca0c610.zip | |
Removed CHECK_HEAP
svn-id: r23979
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 0ab786bbc4..6a7c31b85c 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -566,7 +566,6 @@ void ScummEngine::resetRoomObjects() { const byte *room, *searchptr, *rootptr; const CodeHeader *cdhd; - CHECK_HEAP room = getResourceAddress(rtRoom, _roomResource); if (_numObjectsInRoom == 0) @@ -628,8 +627,6 @@ void ScummEngine::resetRoomObjects() { if (_objs[i].obj_nr && !_objs[i].fl_object_index) resetRoomObject(&_objs[i], room); } - - CHECK_HEAP } void ScummEngine_v3old::resetRoomObjects() { @@ -637,7 +634,6 @@ void ScummEngine_v3old::resetRoomObjects() { ObjectData *od; const byte *room, *ptr; - CHECK_HEAP room = getResourceAddress(rtRoom, _roomResource); if (_numObjectsInRoom == 0) @@ -673,8 +669,6 @@ void ScummEngine_v3old::resetRoomObjects() { dumpResource(buf, od->obj_nr, room + od->OBCDoffset); } } - - CHECK_HEAP } void ScummEngine_v4::resetRoomObjects() { @@ -684,7 +678,6 @@ void ScummEngine_v4::resetRoomObjects() { uint16 obim_id; const byte *room; - CHECK_HEAP room = getResourceAddress(rtRoom, _roomResource); if (_numObjectsInRoom == 0) @@ -729,8 +722,6 @@ void ScummEngine_v4::resetRoomObjects() { resetRoomObject(&_objs[i], room); } } - - CHECK_HEAP } void ScummEngine_c64::resetRoomObject(ObjectData *od, const byte *room, const byte *searchptr) { @@ -1234,7 +1225,6 @@ void ScummEngine::addObjectToInventory(uint obj, uint room) { debug(1, "Adding object %d from room %d into inventory", obj, room); - CHECK_HEAP if (whereIsObject(obj) == WIO_FLOBJECT) { idx = getObjectIndex(obj); assert(idx >= 0); @@ -1256,8 +1246,6 @@ void ScummEngine::addObjectToInventory(uint obj, uint room) { dst = _res->createResource(rtInventory, slot, size); assert(dst); memcpy(dst, ptr, size); - - CHECK_HEAP } void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint room) { |