aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-04-13 16:21:41 +0000
committerPaweł Kołodziejski2003-04-13 16:21:41 +0000
commitaff192d554543b50cac9bf40d6e11a72c314821a (patch)
tree45f4b50b6d8ae5ccfa32372d9583c59b8b89f3af /scumm/object.cpp
parent134d358261576c69a8ad6e5d259b1b8e2e1455dd (diff)
downloadscummvm-rg350-aff192d554543b50cac9bf40d6e11a72c314821a.tar.gz
scummvm-rg350-aff192d554543b50cac9bf40d6e11a72c314821a.tar.bz2
scummvm-rg350-aff192d554543b50cac9bf40d6e11a72c314821a.zip
handle old_bundle size at addObjectToInventory() func
svn-id: r7002
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index f5dbb7ac0f..0adb79478f 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -905,7 +905,9 @@ void Scumm::addObjectToInventory(uint obj, uint room) {
size = READ_BE_UINT32_UNALIGNED(ptr + 4);
} else {
findObjectInRoom(&foir, foCodeHeader, obj, room);
- if (_features & GF_SMALL_HEADER)
+ if (_features & GF_OLD_BUNDLE)
+ size = READ_LE_UINT16(foir.obcd);
+ else if (_features & GF_SMALL_HEADER)
size = READ_LE_UINT32(foir.obcd);
else
size = READ_BE_UINT32_UNALIGNED(foir.obcd + 4);