[Scummvm-cvs-logs] SF.net SVN: scummvm:[38999] scummvm/trunk/engines/scumm/object.cpp

[Kirben at users.sourceforge.net]

Revision: 38999
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38999&view=rev
Author:   Kirben
Date:     2009-03-01 03:45:42 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Fix regression in AppleII/C64 versions of Maniac Mansion.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/object.cpp

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2009-03-01 03:36:57 UTC (rev 38998)
+++ scummvm/trunk/engines/scumm/object.cpp	2009-03-01 03:45:42 UTC (rev 38999)
@@ -589,9 +589,11 @@
 	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 @@
 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.