From 79ecd017e24515e5d9a77e32110a932c7d04b582 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 1 Nov 2013 14:15:19 +0100
Subject: HUFO: Fix CID 1002880, 1002881. Use nullptr where possible instead of
 0

---
 engines/hugo/object.cpp | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'engines/hugo/object.cpp')

diff --git a/engines/hugo/object.cpp b/engines/hugo/object.cpp
index 7b826c80b6..44f46d2d79 100644
--- a/engines/hugo/object.cpp
+++ b/engines/hugo/object.cpp
@@ -44,7 +44,9 @@
 
 namespace Hugo {
 
-ObjectHandler::ObjectHandler(HugoEngine *vm) : _vm(vm), _objects(0), _uses(0) {
+ObjectHandler::ObjectHandler(HugoEngine *vm) : _vm(vm) {
+	_uses = nullptr;
+	_objects = nullptr;
 	_numObj = 0;
 	_objCount = 0;
 	_usesSize = 0;
@@ -249,47 +251,49 @@ void ObjectHandler::lookObject(Object *obj) {
 void ObjectHandler::freeObjects() {
 	debugC(1, kDebugObject, "freeObjects");
 
-	if (_vm->_hero != 0 && _vm->_hero->_seqList[0]._seqPtr != 0) {
+	if (_vm->_hero != nullptr && _vm->_hero->_seqList[0]._seqPtr != nullptr) {
 		// Free all sequence lists and image data
 		for (int16 i = 0; i < _numObj; i++) {
 			Object *obj = &_objects[i];
 			for (int16 j = 0; j < obj->_seqNumb; j++) {
 				Seq *seq = obj->_seqList[j]._seqPtr;
 				Seq *next;
-				if (seq == 0) // Failure during database load
+				if (seq == nullptr) // Failure during database load
 					break;
-				if (seq->_imagePtr != 0) {
+				if (seq->_imagePtr != nullptr) {
 					free(seq->_imagePtr);
-					seq->_imagePtr = 0;
+					seq->_imagePtr = nullptr;
 				}
 				seq = seq->_nextSeqPtr;
 				while (seq != obj->_seqList[j]._seqPtr) {
-					if (seq->_imagePtr != 0) {
+					if (seq->_imagePtr != nullptr) {
 						free(seq->_imagePtr);
-						seq->_imagePtr = 0;
+						seq->_imagePtr = nullptr;
 					}
 					next = seq->_nextSeqPtr;
 					free(seq);
 					seq = next;
 				}
 				free(seq);
+				seq = nullptr;
 			}
 		}
 	}
 
-	if (_uses) {
+	if (_uses != nullptr) {
 		for (int16 i = 0; i < _usesSize; i++)
 			free(_uses[i]._targets);
 		free(_uses);
+		_uses = nullptr;
 	}
 
 	for (int16 i = 0; i < _objCount; i++) {
 		free(_objects[i]._stateDataIndex);
-		_objects[i]._stateDataIndex = 0;
+		_objects[i]._stateDataIndex = nullptr;
 	}
 
 	free(_objects);
-	_objects = 0;
+	_objects = nullptr;
 }
 
 /**
@@ -414,7 +418,7 @@ void ObjectHandler::readUse(Common::ReadStream &in, Uses &curUse) {
  */
 void ObjectHandler::loadObjectUses(Common::ReadStream &in) {
 	Uses tmpUse;
-	tmpUse._targets = 0;
+	tmpUse._targets = nullptr;
 
 	//Read _uses
 	for (int varnt = 0; varnt < _vm->_numVariant; varnt++) {
@@ -430,7 +434,7 @@ void ObjectHandler::loadObjectUses(Common::ReadStream &in) {
 			else {
 				readUse(in, tmpUse);
 				free(tmpUse._targets);
-				tmpUse._targets = 0;
+				tmpUse._targets = nullptr;
 			}
 		}
 	}
@@ -442,7 +446,7 @@ void ObjectHandler::readObject(Common::ReadStream &in, Object &curObject) {
 	uint16 numSubElem = in.readUint16BE();
 
 	if (numSubElem == 0)
-		curObject._stateDataIndex = 0;
+		curObject._stateDataIndex = nullptr;
 	else
 		curObject._stateDataIndex = (uint16 *)malloc(sizeof(uint16) * numSubElem);
 	for (int j = 0; j < numSubElem; j++)
@@ -453,16 +457,16 @@ void ObjectHandler::readObject(Common::ReadStream &in, Object &curObject) {
 	curObject._vyPath = in.readSint16BE();
 	curObject._actIndex = in.readUint16BE();
 	curObject._seqNumb = in.readByte();
-	curObject._currImagePtr = 0;
+	curObject._currImagePtr = nullptr;
 
 	if (curObject._seqNumb == 0) {
 		curObject._seqList[0]._imageNbr = 0;
-		curObject._seqList[0]._seqPtr = 0;
+		curObject._seqList[0]._seqPtr = nullptr;
 	}
 
 	for (int j = 0; j < curObject._seqNumb; j++) {
 		curObject._seqList[j]._imageNbr = in.readUint16BE();
-		curObject._seqList[j]._seqPtr = 0;
+		curObject._seqList[j]._seqPtr = nullptr;
 	}
 
 	curObject._cycling = (Cycle)in.readByte();
@@ -498,7 +502,7 @@ void ObjectHandler::readObject(Common::ReadStream &in, Object &curObject) {
 void ObjectHandler::loadObjectArr(Common::ReadStream &in) {
 	debugC(6, kDebugObject, "loadObject(&in)");
 	Object tmpObject;
-	tmpObject._stateDataIndex = 0;
+	tmpObject._stateDataIndex = nullptr;
 
 	for (int varnt = 0; varnt < _vm->_numVariant; varnt++) {
 		uint16 numElem = in.readUint16BE();
@@ -515,7 +519,7 @@ void ObjectHandler::loadObjectArr(Common::ReadStream &in) {
 				// Skip over uneeded objects.
 				readObject(in, tmpObject);
 				free(tmpObject._stateDataIndex);
-				tmpObject._stateDataIndex = 0;
+				tmpObject._stateDataIndex = nullptr;
 			}
 		}
 	}
-- 
cgit v1.2.3