From a265844351bc145d2254c23e69d629a049bdafc3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 6 Jun 2007 16:37:10 +0000
Subject: 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
---
 engines/saga/saga.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines/saga/saga.cpp')

diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 3ce0e08d9c..7573988a8d 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -352,6 +352,10 @@ const char *SagaEngine::getObjectName(uint16 objectId) {
 		return _actor->_actorsStrings.getString(actor->_nameIndex);
 	case kGameObjectHitZone:
 		hitZone = _scene->_objectMap->getHitZone(objectIdToIndex(objectId));
+
+		if (hitZone == NULL)
+			return "";
+
 		return _scene->_sceneStrings.getString(hitZone->getNameIndex());
 	}
 	warning("SagaEngine::getObjectName name not found for 0x%X", objectId);
-- 
cgit v1.2.3