From 82c354b9d4f1c5ca15a37fde10d6be88a90679db Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Sun, 13 Mar 2005 00:04:32 +0000
Subject: [PATCH] A few extra bits

svn-id: r17110
---
 scumm/object.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scumm/object.cpp b/scumm/object.cpp
index 631e10a3d6f..11ba41d06eb 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -174,10 +174,13 @@ int ScummEngine::getObjectImageCount(int object) {
 	int objnum;
 
 	objnum = getObjectIndex(object);
-	assert(objnum != -1);
+	if (objnum == -1);
+		return 0;
 
 	ptr = getOBIMFromObject(_objs[objnum]);
 	imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
+	if (!imhd)
+		return 0;
 
 	if (_version == 8)
 		return (READ_LE_UINT32(&imhd->v8.image_count));