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/base/gfx/osystem/base_render_osystem.cpp | |
| 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/base/gfx/osystem/base_render_osystem.cpp')
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index a5b251cea6..748affa13f 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -262,7 +262,7 @@ void BaseRenderOSystem::fadeToColor(byte r, byte g, byte b, byte a, Common::Rect Common::Rect sizeRect(fillRect); sizeRect.translate(-fillRect.top, -fillRect.left); surf.fillRect(fillRect, col); - drawSurface(NULL, &surf, &sizeRect, &fillRect, false, false); + drawSurface(nullptr, &surf, &sizeRect, &fillRect, false, false); surf.free(); //SDL_SetRenderDrawColor(_renderer, r, g, b, a); @@ -287,7 +287,7 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S } if (owner) { // Fade-tickets are owner-less - RenderTicket compare(owner, NULL, srcRect, dstRect, mirrorX, mirrorY, disableAlpha); + RenderTicket compare(owner, nullptr, srcRect, dstRect, mirrorX, mirrorY, disableAlpha); compare._batchNum = _batchNum; if (_spriteBatch) { _batchNum++; |