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 | |
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')
-rw-r--r-- | engines/wintermute/base/base_object.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_object.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_persistence_manager.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_sprite.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_emitter.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index eba8416485..ab7d930202 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -1179,7 +1179,7 @@ bool BaseObject::updateSounds() { if (_soundEvent) { if (_sFX && !_sFX->isPlaying()) { applyEvent(_soundEvent); - setSoundEvent(NULL); + setSoundEvent(nullptr); } } diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index 96fed2b847..c8491c2cf6 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -52,7 +52,7 @@ protected: bool resumeSFX(); bool pauseSFX(); bool stopSFX(bool deleteSound = true); - bool playSFX(const char *filename, bool looping = false, bool playNow = true, const char *eventName = NULL, uint32 loopStart = 0); + bool playSFX(const char *filename, bool looping = false, bool playNow = true, const char *eventName = nullptr, uint32 loopStart = 0); BaseSound *_sFX; TSFXType _sFXType; float _sFXParam1; diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 114f6e066f..8cc21b353b 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -87,7 +87,7 @@ public: bool transfer(const char *name, Common::String *val); bool transfer(const char *name, Vector2 *val); bool transfer(const char *name, AnsiStringArray &Val); - BasePersistenceManager(const char *savePrefix = NULL, bool deleteSingleton = false); + BasePersistenceManager(const char *savePrefix = nullptr, bool deleteSingleton = false); virtual ~BasePersistenceManager(); bool checkVersion(byte verMajor, byte verMinor, byte verBuild); diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 468af1bd75..194bbc86f0 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -64,7 +64,7 @@ void BaseSprite::setDefaults() { _currentFrame = -1; _looping = false; _lastFrameTime = 0; - setFilename(NULL); + setFilename(nullptr); _finished = false; _changed = false; _paused = false; 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++; 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, |