Added sanity checks for hitzones in SAGA, after discussing with h00ligan and sev. Removed a hack for IHNM which is not needed anymore and removed a redundant check for zero object types

svn-id: r27140

1 files changed, 1 insertions, 6 deletions

diff --git a/engines/saga/objectmap.h b/engines/saga/objectmap.h
index 39c9f045e5..c3b50c7497 100644
--- a/engines/saga/objectmap.h
+++ b/engines/saga/objectmap.h
@@ -110,12 +110,7 @@ public:
 	int hitTest(const Point& testPoint);
 	HitZone *getHitZone(int16 index) {
 		if ((index < 0) || (index >= _hitZoneListCount)) {
-			// HACK: If we get a wrong hitzone, return the last hitzone in the list
-			// Normally, we don't get wrong hitzones in ITE, however IHNM still seems
-			// to have problems with some, therefore just throw a warning for now and
-			// continue with a valid hitzone
-			warning("ObjectMap::getHitZone wrong index 0x%X, adjusting it to 0x%X", index, _hitZoneListCount - 1);
-			index = _hitZoneListCount - 1;
+			return NULL;
 		}
 		return _hitZoneList[index];
 	}