aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo/object.cpp
diff options
context:
space:
mode:
authorDavid Turner2010-12-06 23:15:25 +0000
committerDavid Turner2010-12-06 23:15:25 +0000
commit8ca0b867e0f5127cf192b7cb7a7c12216a9545a4 (patch)
tree24262e0b303dd9042469ab4a16ad166511dd6d1d /engines/hugo/object.cpp
parentedf4b1926bd7365d5b88c9e344aca35cf44da4db (diff)
downloadscummvm-rg350-8ca0b867e0f5127cf192b7cb7a7c12216a9545a4.tar.gz
scummvm-rg350-8ca0b867e0f5127cf192b7cb7a7c12216a9545a4.tar.bz2
scummvm-rg350-8ca0b867e0f5127cf192b7cb7a7c12216a9545a4.zip
HUGO: Fixed Valgrind Errors and Segfault when hugo.dat is missing.
svn-id: r54804
Diffstat (limited to 'engines/hugo/object.cpp')
-rw-r--r--engines/hugo/object.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/hugo/object.cpp b/engines/hugo/object.cpp
index 6597e89cef..550d803bfb 100644
--- a/engines/hugo/object.cpp
+++ b/engines/hugo/object.cpp
@@ -48,6 +48,7 @@ namespace Hugo {
ObjectHandler::ObjectHandler(HugoEngine *vm) : _vm(vm), _objects(0) {
_numObj = 0;
+ _objCount = 0;
}
ObjectHandler::~ObjectHandler() {
@@ -211,7 +212,7 @@ void ObjectHandler::freeObjects() {
debugC(1, kDebugObject, "freeObjects");
// Nothing to do if not allocated yet
- if (_vm->_hero->seqList[0].seqPtr == 0)
+ if (_vm->_hero == 0 || _vm->_hero->seqList[0].seqPtr == 0)
return;
// Free all sequence lists and image data