WINTERMUTE: Replace a few NULLs with nullptr.

13 files changed, 17 insertions, 17 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;
 }
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,
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++) {
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 4d3adc95b2..426080d693 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -139,7 +139,7 @@ int WintermuteEngine::init() {
 		return 1;
 	}
 	BaseEngine::instance().setGameRef(_game);
-	BasePlatform::initialize(this, _game, 0, NULL);
+	BasePlatform::initialize(this, _game, 0, nullptr);
 
 	bool windowedMode = !ConfMan.getBool("fullscreen");