WINTERMUTE: Replace all NULLs with nullptr.

4 files changed, 14 insertions, 14 deletions

diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp
index 2577b8aedc..42857b5c1b 100644
--- a/engines/wintermute/video/video_player.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -50,7 +50,7 @@ bool VideoPlayer::setDefaults() {
 	_playPosX = _playPosY = 0;
 	_playZoom = 0.0f;
 
-	_filename = NULL;
+	_filename = nullptr;
 
 	_slowRendering = false;
 
diff --git a/engines/wintermute/video/video_player.h b/engines/wintermute/video/video_player.h
index d5466da679..a49e910b0c 100644
--- a/engines/wintermute/video/video_player.h
+++ b/engines/wintermute/video/video_player.h
@@ -58,7 +58,7 @@ public:
 	bool _playing;
 	bool display();
 	bool update();
-	bool initialize(const char *inFilename, const char *subtitleFile = NULL);
+	bool initialize(const char *inFilename, const char *subtitleFile = nullptr);
 	bool cleanup();
 	VideoPlayer(BaseGame *inGame);
 	virtual ~VideoPlayer();
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index d14c807e11..1f6842c416 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -51,7 +51,7 @@ VideoTheoraPlayer::VideoTheoraPlayer(BaseGame *inGame) : BaseClass(inGame) {
 //////////////////////////////////////////////////////////////////////////
 void VideoTheoraPlayer::SetDefaults() {
 
-	_file = NULL;
+	_file = nullptr;
 	_filename = "";
 	_startTime = 0;
 	_looping = false;
@@ -68,8 +68,8 @@ void VideoTheoraPlayer::SetDefaults() {
 	_playbackStarted = false;
 	_dontDropFrames = false;
 
-	_texture = NULL;
-	_alphaImage = NULL;
+	_texture = nullptr;
+	_alphaImage = nullptr;
 	_alphaFilename = "";
 
 	_frameRendered = false;
@@ -84,10 +84,10 @@ void VideoTheoraPlayer::SetDefaults() {
 	_savedState = THEORA_STATE_NONE;
 	_savedPos = 0;
 	_volume = 100;
-	_theoraDecoder = NULL;
+	_theoraDecoder = nullptr;
 
 	// TODO: Add subtitles-support
-	//_subtitler = NULL;
+	//_subtitler = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ VideoTheoraPlayer::~VideoTheoraPlayer(void) {
 void VideoTheoraPlayer::cleanup() {
 	if (_file) {
 		BaseFileManager::getEngineInstance()->closeFile(_file);
-		_file = NULL;
+		_file = nullptr;
 	}
 
 	_surface.free();
@@ -108,11 +108,11 @@ void VideoTheoraPlayer::cleanup() {
 		_theoraDecoder->close();
 	}
 	delete _theoraDecoder;
-	_theoraDecoder = NULL;
+	_theoraDecoder = nullptr;
 	delete _alphaImage;
-	_alphaImage = NULL;
+	_alphaImage = nullptr;
 	delete _texture;
-	_texture = NULL;
+	_texture = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,7 @@ bool VideoTheoraPlayer::resetStream() {
 		_theoraDecoder->close();
 	}
 	delete _theoraDecoder;
-	_theoraDecoder = NULL;
+	_theoraDecoder = nullptr;
 
 	_file = BaseFileManager::getEngineInstance()->openFile(_filename, true, false);
 	if (!_file) {
@@ -419,7 +419,7 @@ bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) {
 	_alphaImage = new BaseImage();
 	if (!_alphaImage || DID_FAIL(_alphaImage->loadFile(filename))) {
 		delete _alphaImage;
-		_alphaImage = NULL;
+		_alphaImage = nullptr;
 		_alphaFilename = "";
 		return STATUS_FAILED;
 	}
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 593c1b9666..7a6742271c 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -62,7 +62,7 @@ public:
 	//CVidSubtitler *_subtitler;
 
 	// control methods
-	bool initialize(const Common::String &filename, const Common::String &subtitleFile = NULL);
+	bool initialize(const Common::String &filename, const Common::String &subtitleFile = nullptr);
 	bool initializeSimple();
 	bool update();
 	bool play(TVideoPlayback type = VID_PLAY_CENTER, int x = 0, int y = 0, bool freezeGame = false, bool freezeMusic = true, bool looping = false, uint32 startTime = 0, float forceZoom = -1.0f, int volume = -1);