aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-03-12 23:59:14 +0000
committerTravis Howell2005-03-12 23:59:14 +0000
commit44205266e8dc5236fa6a545f9d198923b87000bc (patch)
treea0fcb4ce4e95fa3a2b8da0d1ec3750aa83bd5c6b /scumm/object.cpp
parent73ec1f17454504aa26f5502208b4fb3157953d42 (diff)
downloadscummvm-rg350-44205266e8dc5236fa6a545f9d198923b87000bc.tar.gz
scummvm-rg350-44205266e8dc5236fa6a545f9d198923b87000bc.tar.bz2
scummvm-rg350-44205266e8dc5236fa6a545f9d198923b87000bc.zip
Add missing case for getObjectData
svn-id: r17109
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index c44e9a112a..631e10a3d6 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -178,7 +178,11 @@ int ScummEngine::getObjectImageCount(int object) {
ptr = getOBIMFromObject(_objs[objnum]);
imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
- return (READ_LE_UINT32(&imhd->v8.image_count));
+
+ if (_version == 8)
+ return (READ_LE_UINT32(&imhd->v8.image_count));
+ else
+ return (READ_LE_UINT16(&imhd->old.image_count));
}
int ScummEngine::whereIsObject(int object) const {