From 1bb3d1412918be5faa0f1994beb6afaddf3b768a Mon Sep 17 00:00:00 2001
From: Borja Lorente
Date: Thu, 11 Aug 2016 10:00:50 +0200
Subject: MACVENTURE: Unify NULLs

---
 engines/macventure/gui.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/macventure/gui.cpp')

diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 56381369bb..65b11ee402 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -103,11 +103,11 @@ void menuCommandsCallback(int action, Common::String &text, void *data);
 Gui::Gui(MacVentureEngine *engine, Common::MacResManager *resman) {
 	_engine = engine;
 	_resourceManager = resman;
-	_windowData = nullptr;
-	_controlData = nullptr;
+	_windowData = NULL;
+	_controlData = NULL;
 	_draggedObj.id = 0;
 	_draggedObj.pos = Common::Point(0, 0);
-	_dialog = nullptr;
+	_dialog = NULL;
 
 	_cursor = new Cursor(this);
 
@@ -846,7 +846,7 @@ void Gui::showPrebuiltDialog(PrebuiltDialogs type) {
 }
 
 bool Gui::isDialogOpen() {
-	return _dialog != nullptr;
+	return _dialog != NULL;
 }
 
 void Gui::setTextInput(Common::String str) {
@@ -856,7 +856,7 @@ void Gui::setTextInput(Common::String str) {
 
 void Gui::closeDialog() {
 	delete _dialog;
-	_dialog = nullptr;
+	_dialog = NULL;
 }
 
 void Gui::getTextFromUser() {
@@ -950,7 +950,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) {
 	}
 	switch (reference) {
 	case MacVenture::kNoWindow:
-		return nullptr;
+		return NULL;
 	case MacVenture::kCommandsWindow:
 		return _controlsWindow;
 	case MacVenture::kMainGameWindow:
@@ -964,7 +964,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) {
 	case MacVenture::kDiplomaWindow:
 		return _diplomaWindow;
 	}
-	return nullptr;
+	return NULL;
 }
 
 void Gui::ensureInventoryOpen(WindowReference reference, ObjID id) {
-- 
cgit v1.2.3