diff options
| author | Filippos Karapetis | 2007-06-06 16:37:10 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-06-06 16:37:10 +0000 |
| commit | a265844351bc145d2254c23e69d629a049bdafc3 (patch) | |
| tree | 0988b8eb167066699c91debd9de790ffe2b224b1 /engines/saga/saga.cpp | |
| parent | 44d98de023f65d5d51407b8d27eba47c79795f1b (diff) | |
| download | scummvm-rg350-a265844351bc145d2254c23e69d629a049bdafc3.tar.gz scummvm-rg350-a265844351bc145d2254c23e69d629a049bdafc3.tar.bz2 scummvm-rg350-a265844351bc145d2254c23e69d629a049bdafc3.zip | |
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
Diffstat (limited to 'engines/saga/saga.cpp')
| -rw-r--r-- | engines/saga/saga.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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); |