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/ui | |
| 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/ui')
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index a3283d5a01..bad77db748 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -579,7 +579,7 @@ bool UIEdit::display(int offsetX, int offsetY) { _back->display(offsetX + _posX, offsetY + _posY, _width, _height); } if (_image) { - _image->draw(offsetX + _posX, offsetY + _posY, NULL); + _image->draw(offsetX + _posX, offsetY + _posY, nullptr); } // prepare fonts @@ -726,7 +726,7 @@ bool UIEdit::display(int offsetX, int offsetY) { } - _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); + _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false)); _gameRef->_textEncoding = OrigEncoding; diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 9606486efb..e73bab9859 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -218,7 +218,7 @@ bool UIWindow::display(int offsetX, int offsetY) { } if (!_transparent && !image) { - _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, NULL, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); + _gameRef->_renderer->addRectToList(new BaseActiveRect(_gameRef, this, nullptr, _posX + offsetX, _posY + offsetY, _width, _height, 100, 100, false)); } for (uint32 i = 0; i < _widgets.size(); i++) { |