[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.206,1.207 script_v90he.cpp,2.181,2.182

kirben kirben at users.sourceforge.net
Sat Mar 12 15:59:54 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21416/scumm

Modified Files:
	object.cpp script_v90he.cpp 
Log Message:

Add missing case for getObjectData


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- object.cpp	11 Mar 2005 01:09:57 -0000	1.206
+++ object.cpp	12 Mar 2005 23:59:14 -0000	1.207
@@ -178,7 +178,11 @@
 
 	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 {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.181
retrieving revision 2.182
diff -u -d -r2.181 -r2.182
--- script_v90he.cpp	11 Mar 2005 01:10:03 -0000	2.181
+++ script_v90he.cpp	12 Mar 2005 23:59:14 -0000	2.182
@@ -1921,7 +1921,7 @@
 			push(_objs[_heObjectNum].height);
 		break;
 	case 4:
-		push(0);
+		push(getObjectImageCount(_heObject));
 		break;
 	case 6:
 		if (_heObjectNum == -1)





More information about the Scummvm-git-logs mailing list