aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2009-03-01 03:45:42 +0000
committerTravis Howell2009-03-01 03:45:42 +0000
commit9ffd6a8768c0d65b36fb58eb2ad41bc652fd4e2c (patch)
tree6a8830e0ec245cb4b5ce551cf674955fb28deb36 /engines
parent3b16073a38f1869698ed7ea0066d91f4fbfc7e04 (diff)
downloadscummvm-rg350-9ffd6a8768c0d65b36fb58eb2ad41bc652fd4e2c.tar.gz
scummvm-rg350-9ffd6a8768c0d65b36fb58eb2ad41bc652fd4e2c.tar.bz2
scummvm-rg350-9ffd6a8768c0d65b36fb58eb2ad41bc652fd4e2c.zip
Fix regression in AppleII/C64 versions of Maniac Mansion.
svn-id: r38999
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/object.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index f815d5bfb8..87d9278023 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -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);