aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalter van Niftrik2011-02-09 00:27:50 +0000
committerWalter van Niftrik2011-02-09 00:27:50 +0000
commit386203a3d6ce1abf457c9110d695408ec5f01b85 (patch)
tree9cc3fd567b00aab967cd52bff79ade1b747ac8f7
parent058d75b70810965a508fa5d56d449fed242a6cf8 (diff)
downloadscummvm-rg350-386203a3d6ce1abf457c9110d695408ec5f01b85.tar.gz
scummvm-rg350-386203a3d6ce1abf457c9110d695408ec5f01b85.tar.bz2
scummvm-rg350-386203a3d6ce1abf457c9110d695408ec5f01b85.zip
SCI: Do not try to dereference object name when it's not a pointer.
Stops flood of warnings in some Mac titles. svn-id: r55849
-rw-r--r--engines/sci/engine/seg_manager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index f364b4891a..ffc81f0fde 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -254,7 +254,9 @@ const char *SegManager::getObjectName(reg_t pos) {
if (nameReg.isNull())
return "<no name>";
- const char *name = derefString(nameReg);
+ const char *name = 0;
+ if (nameReg.segment)
+ name = derefString(nameReg);
if (!name)
return "<invalid name>";