[Scummvm-git-logs] scummvm master -> 85cd34750395475701cad009d221646744eb2f16

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
85cd347503 STARTREK: Fix compilation on macOS


Commit: 85cd34750395475701cad009d221646744eb2f16
    https://github.com/scummvm/scummvm/commit/85cd34750395475701cad009d221646744eb2f16
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-08-09T09:20:51+02:00

Commit Message:
STARTREK: Fix compilation on macOS

nullptr is an object on macOS.

Changed paths:
    engines/startrek/awaymission.cpp
    engines/startrek/intro.cpp
    engines/startrek/space.cpp
    engines/startrek/textbox.cpp


diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index ce70903..9b4d936 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -565,7 +565,7 @@ void StarTrekEngine::handleAwayMissionAction() {
 				break;
 
 			case OBJECT_REDSHIRT:
-				showTextbox(nullptr, getLoadedText(GROUNDTX_REDSHIRT_USE), 20, 20, TEXTCOLOR_YELLOW, 0);
+				showTextbox(NULL, getLoadedText(GROUNDTX_REDSHIRT_USE), 20, 20, TEXTCOLOR_YELLOW, 0);
 				break;
 
 			case OBJECT_IPHASERS:
diff --git a/engines/startrek/intro.cpp b/engines/startrek/intro.cpp
index 8d17fc4..08cd08a 100644
--- a/engines/startrek/intro.cpp
+++ b/engines/startrek/intro.cpp
@@ -39,8 +39,8 @@ void StarTrekEngine::playIntro() {
 	R3 planetR3 = R3();
 	planetR3.matrix = initMatrix();
 	planetR3.field1e = 3;
-	planetR3.funcPtr1 = nullptr;
-	planetR3.funcPtr2 = nullptr;
+	planetR3.funcPtr1 = NULL;
+	planetR3.funcPtr2 = NULL;
 	planetR3.bitmapOffset = 0;
 
 	_gfx->clearScreenAndPriBuffer();
diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
index 054e78b..0286408 100644
--- a/engines/startrek/space.cpp
+++ b/engines/startrek/space.cpp
@@ -228,7 +228,7 @@ void StarTrekEngine::drawR3Shape(R3 *r3) {
 	if (r3->field1e != 3) // TODO: remove this
 		return;
 
-	if (r3->funcPtr1 != nullptr) {
+	if (r3->funcPtr1 != NULL) {
 		// TODO: call it
 	}
 
@@ -485,7 +485,7 @@ void StarTrekEngine::drawR3Shape(R3 *r3) {
 		}
 	}
 
-	if (r3->funcPtr2 != nullptr) {
+	if (r3->funcPtr2 != NULL) {
 		// TODO: call it
 	}
 }
diff --git a/engines/startrek/textbox.cpp b/engines/startrek/textbox.cpp
index f82369c..0e38ec7 100644
--- a/engines/startrek/textbox.cpp
+++ b/engines/startrek/textbox.cpp
@@ -636,7 +636,7 @@ String StarTrekEngine::readLineFormattedText(TextGetterFunc textGetter, uintptr
 
 		return lineFormattedText;
 	} else
-		return nullptr;
+		return NULL;
 }
 
 String StarTrekEngine::readTextFromArray(int choiceIndex, uintptr data, String *headerTextOutput) {