diff options
author | Einar Johan Trøan Sømåen | 2013-01-26 17:36:20 +0100 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-01-26 17:36:20 +0100 |
commit | 798b440256c12ba878f16fa3215b4812c46a90a5 (patch) | |
tree | a4b459c143032fee0bdf9bf46ade9a1bff4497a3 /engines/wintermute/ad | |
parent | 8469b866cf9cdc2eb493f65bf34724e1ac25b6b5 (diff) | |
download | scummvm-rg350-798b440256c12ba878f16fa3215b4812c46a90a5.tar.gz scummvm-rg350-798b440256c12ba878f16fa3215b4812c46a90a5.tar.bz2 scummvm-rg350-798b440256c12ba878f16fa3215b4812c46a90a5.zip |
WINTERMUTE: Replace a few NULLs with nullptr.
Diffstat (limited to 'engines/wintermute/ad')
-rw-r--r-- | engines/wintermute/ad/ad_game.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/ad/ad_object.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/ad/ad_scene.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp index 29e932a586..1fd776e386 100644 --- a/engines/wintermute/ad/ad_game.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -1499,7 +1499,7 @@ bool AdGame::scheduleChangeScene(const char *filename, bool fadeIn) { ////////////////////////////////////////////////////////////////////////// bool AdGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) { - BaseGame::getVersion(verMajor, verMinor, NULL, NULL); + BaseGame::getVersion(verMajor, verMinor, nullptr, nullptr); if (extMajor) { *extMajor = 0; diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp index a940b33805..fc107b62c6 100644 --- a/engines/wintermute/ad/ad_object.cpp +++ b/engines/wintermute/ad/ad_object.cpp @@ -348,7 +348,7 @@ bool AdObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack ScValue *val = stack->pop(); if (val->isNULL()) { - setFont(NULL); + setFont(nullptr); } else { setFont(val->getString()); } diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 526e0802cb..ccdaaf36b8 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -1078,7 +1078,7 @@ bool AdScene::traverseNodes(bool doUpdate) { if (doUpdate) { updateFreeObjects(); } else { - displayRegionContent(NULL); + displayRegionContent(nullptr); } } } // each layer @@ -1878,7 +1878,7 @@ ScValue *AdScene::scGetProperty(const Common::String &name) { ////////////////////////////////////////////////////////////////////////// else if (name == "MouseY") { int viewportY; - getViewportOffset(NULL, &viewportY); + getViewportOffset(nullptr, &viewportY); _scValue->setInt(_gameRef->_mousePos.y + _offsetTop - viewportY); return _scValue; @@ -2591,7 +2591,7 @@ int AdScene::getOffsetLeft() { ////////////////////////////////////////////////////////////////////////// int AdScene::getOffsetTop() { int viewportY; - getViewportOffset(NULL, &viewportY); + getViewportOffset(nullptr, &viewportY); return _offsetTop - viewportY; } |