thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing case for getObjectData

Browse source 
svn-id: r17109
This commit is contained in:
Travis Howell 2005-03-12 23:59:14 +00:00
parent 73ec1f1745
commit 44205266e8
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/object.cpp
View file

@ -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 {

2
scumm/script_v90he.cpp
View file

@ -1921,7 +1921,7 @@ void ScummEngine_v90he::o90_getObjectData() {
push(_objs[_heObjectNum].height);
break;
case 4:
push(0);
push(getObjectImageCount(_heObject));
break;
case 6:
if (_heObjectNum == -1)