ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in AppleII/C64 versions of Maniac Mansion.

Browse Source 
svn-id: r38999
This commit is contained in:
Travis Howell
2009-03-01 03:45:42 +00:00
parent 3b16073a38
commit 9ffd6a8768
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/object.cpp
+4 -6
View File
@@ -589,9 +589,11 @@ void ScummEngine::drawObject(int obj, int arg) {
if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip)
return;
ptr = getOBIMFromObjectData(od);
ptr = getObjectImage(ptr, getState(od.obj_nr));
// For objects without image in Apple II & Commodore 64 versions of Maniac Mansion
if (_game.version == 0 && od.OBIMoffset == 0)
return;
ptr = getObjectImage(getOBIMFromObjectData(od), getState(od.obj_nr));
if (!ptr)
return;
@@ -1221,10 +1223,6 @@ byte *ScummEngine::getOBCDFromObject(int obj) {
const byte *ScummEngine::getOBIMFromObjectData(const ObjectData &od) {
const byte *ptr;
// For objects without image in C64 version of Maniac Mansion
if (_game.version == 0 && od.OBIMoffset == 0)
return NULL;
if (od.fl_object_index) {
ptr = getResourceAddress(rtFlObject, od.fl_object_index);
ptr = findResource(MKID_BE('OBIM'), ptr);