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/particles | |
| 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/particles')
| -rw-r--r-- | engines/wintermute/base/particles/part_emitter.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index 3aa55e1ac8..54a49df230 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -48,7 +48,7 @@ public: bool start(); bool update(); - bool display() { return display(NULL); } // To avoid shadowing the inherited display-function. + bool display() { return display(nullptr); } // To avoid shadowing the inherited display-function. bool display(BaseRegion *region); bool sortParticlesByZ(); diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 0b850d9618..c8cf3fcc10 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -199,7 +199,7 @@ bool PartParticle::display(PartEmitter *emitter) { _sprite->getCurrentFrame(); return _sprite->display((int)_pos.x, (int)_pos.y, - NULL, + nullptr, _scale, _scale, BYTETORGBA(255, 255, 255, _currentAlpha), _rotation, |