aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base.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.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.cpp')
-rw-r--r--engines/wintermute/base/base.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index e351792e61..c0459b0ce5 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -42,7 +42,7 @@ BaseClass::BaseClass(BaseGame *gameOwner) {
//////////////////////////////////////////////////////////////////////////
BaseClass::BaseClass() {
- _gameRef = NULL;
+ _gameRef = nullptr;
_persistable = true;
}
@@ -111,8 +111,8 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) {
buffer = params;
}
- char *propName = NULL;
- char *propValue = NULL;
+ char *propName = nullptr;
+ char *propValue = nullptr;
while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {
switch (cmd) {
@@ -141,16 +141,16 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) {
if (cmd == PARSERR_TOKENNOTFOUND) {
delete[] propName;
delete[] propValue;
- propName = NULL;
- propValue = NULL;
+ propName = nullptr;
+ propValue = nullptr;
_gameRef->LOG(0, "Syntax error in EDITOR_PROPERTY definition");
return STATUS_FAILED;
}
- if (cmd == PARSERR_GENERIC || propName == NULL || propValue == NULL) {
+ if (cmd == PARSERR_GENERIC || propName == nullptr || propValue == nullptr) {
delete[] propName;
delete[] propValue;
- propName = NULL;
- propValue = NULL;
+ propName = nullptr;
+ propValue = nullptr;
_gameRef->LOG(0, "Error loading EDITOR_PROPERTY definition");
return STATUS_FAILED;
}
@@ -160,8 +160,8 @@ bool BaseClass::parseEditorProperty(byte *buffer, bool complete) {
delete[] propName;
delete[] propValue;
- propName = NULL;
- propValue = NULL;
+ propName = nullptr;
+ propValue = nullptr;
return STATUS_OK;
}