aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base_scriptable.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-26 18:06:42 +0100
committerEinar Johan Trøan Sømåen2013-01-26 18:07:07 +0100
commit980dc4a456f55a8b6526d2bc6f7694a0b2d666b3 (patch)
treebef13619df90984b731795e72721da7d39089041 /engines/wintermute/base/base_scriptable.cpp
parent6ae97cdfbe88fa34363aabc46847b0c9a32eefe5 (diff)
downloadscummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.gz
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.bz2
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.zip
WINTERMUTE: Replace all NULLs with nullptr.
Diffstat (limited to 'engines/wintermute/base/base_scriptable.cpp')
-rw-r--r--engines/wintermute/base/base_scriptable.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp
index 8c5ef7e45a..7dbcd72200 100644
--- a/engines/wintermute/base/base_scriptable.cpp
+++ b/engines/wintermute/base/base_scriptable.cpp
@@ -39,14 +39,14 @@ BaseScriptable::BaseScriptable(BaseGame *inGame, bool noValue, bool persistable)
_refCount = 0;
if (noValue) {
- _scValue = NULL;
+ _scValue = nullptr;
} else {
_scValue = new ScValue(_gameRef);
}
_persistable = persistable;
- _scProp = NULL;
+ _scProp = nullptr;
}
@@ -55,8 +55,8 @@ BaseScriptable::~BaseScriptable() {
//if (_refCount>0) _gameRef->LOG(0, "Warning: Destroying object, _refCount=%d", _refCount);
delete _scValue;
delete _scProp;
- _scValue = NULL;
- _scProp = NULL;
+ _scValue = nullptr;
+ _scProp = nullptr;
}
@@ -83,7 +83,7 @@ ScValue *BaseScriptable::scGetProperty(const Common::String &name) {
if (_scProp) {
return _scProp->getProp(name.c_str()); // TODO: Change to Common::String
} else {
- return NULL;
+ return nullptr;
}
}
@@ -185,7 +185,7 @@ bool BaseScriptable::canHandleMethod(const char *eventMethod) const {
//////////////////////////////////////////////////////////////////////////
ScScript *BaseScriptable::invokeMethodThread(const char *methodName) {
- return NULL;
+ return nullptr;
}
} // end of namespace Wintermute