[Scummvm-git-logs] scummvm master -> d4f0392e575c0e8ef2c752a9a0892749f059ad1a

[digitall]

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:
d4f0392e57 STARTREK: Compilation Fixes for Various Platforms.


Commit: d4f0392e575c0e8ef2c752a9a0892749f059ad1a
    https://github.com/scummvm/scummvm/commit/d4f0392e575c0e8ef2c752a9a0892749f059ad1a
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T10:18:46+01:00

Commit Message:
STARTREK: Compilation Fixes for Various Platforms.

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


diff --git a/engines/startrek/intro.cpp b/engines/startrek/intro.cpp
index 08cd08a..7ba865a 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 = NULL;
-	planetR3.funcPtr2 = NULL;
+	planetR3.funcPtr1 = 0;
+	planetR3.funcPtr2 = 0;
 	planetR3.bitmapOffset = 0;
 
 	_gfx->clearScreenAndPriBuffer();
diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
index 0286408..60c37c8 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 != NULL) {
+	if (r3->funcPtr1 != 0) {
 		// TODO: call it
 	}
 
@@ -485,7 +485,7 @@ void StarTrekEngine::drawR3Shape(R3 *r3) {
 		}
 	}
 
-	if (r3->funcPtr2 != NULL) {
+	if (r3->funcPtr2 != 0) {
 		// TODO: call it
 	}
 }