diff options
author | Travis Howell | 2007-06-05 22:38:43 +0000 |
---|---|---|
committer | Travis Howell | 2007-06-05 22:38:43 +0000 |
commit | 248d527a566e3adc8cd9a90e330d6b665861272c (patch) | |
tree | 5efc2b3cbee9640c1938d1abb5e6424b9993dce0 | |
parent | c0a33c57b3b1f173c60f655913010e39e4c284d3 (diff) | |
download | scummvm-rg350-248d527a566e3adc8cd9a90e330d6b665861272c.tar.gz scummvm-rg350-248d527a566e3adc8cd9a90e330d6b665861272c.tar.bz2 scummvm-rg350-248d527a566e3adc8cd9a90e330d6b665861272c.zip |
Avoid compiler warnings.
svn-id: r27118
-rw-r--r-- | engines/saga/script.cpp | 4 | ||||
-rw-r--r-- | engines/saga/sfuncs.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 3c5938ff03..60a23c83ce 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -464,7 +464,7 @@ void Script::doVerb() { } } - if (objectType == NULL) + if (objectType == 0) return; else if (objectType == kGameObjectHitZone) { scriptModuleNumber = _vm->_scene->getScriptModuleNumber(); @@ -619,7 +619,7 @@ void Script::playfieldClick(const Point& mousePoint, bool leftButton) { hitZone = NULL; - if (objectTypeId(_pendingObject[0]) == NULL) + if (objectTypeId(_pendingObject[0]) == 0) return; else if (objectTypeId(_pendingObject[0]) == kGameObjectHitZone) { hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(_pendingObject[0])); diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 0c9d415c59..e7fe746acc 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -386,7 +386,7 @@ void Script::sfScriptDoAction(SCRIPTFUNC_PARAMS) { break; case kGameObjectHitZone: case kGameObjectStepZone: - if (objectTypeId(objectId) == NULL) + if (objectTypeId(objectId) == 0) return; else if (objectTypeId(objectId) == kGameObjectHitZone) hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId)); @@ -739,7 +739,7 @@ void Script::sfEnableZone(SCRIPTFUNC_PARAMS) { return; // Do nothing } - if (objectTypeId(objectId) == NULL) + if (objectTypeId(objectId) == 0) return; else if (objectTypeId(objectId) == kGameObjectHitZone) hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId)); |